minor symfony#28811 Remove usage of sf2 when possible (fabpot)

fabpot · fabpot · commit 7cb823a5b6c3 · 2018-10-11T03:53:47.000-07:00
This PR was merged into the 4.2-dev branch. Discussion ---------- Remove usage of sf2 when possible | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | n/a | License | MIT | Doc PR | n/a I've not removed all `sf2` occurrences as I've kept the ones that would introduce a BC break. Commits ------- 8406ee8 removed usage of sf2 when possible
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
@@ -33,7 +33,7 @@ protected function setUp()
     {
         $this->fs = new Filesystem();
         $this->kernel = new TestAppKernel('test', true);
-        $this->rootDir = sys_get_temp_dir().\DIRECTORY_SEPARATOR.uniqid('sf2_cache_', true);
+        $this->rootDir = sys_get_temp_dir().\DIRECTORY_SEPARATOR.uniqid('sf_cache_', true);
         $this->kernel->setRootDir($this->rootDir);
         $this->fs->mkdir($this->rootDir);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php
@@ -68,7 +68,7 @@ public function testDebugDefaultRootDirectory()
     {
         $this->fs->remove($this->translationDir);
         $this->fs = new Filesystem();
-        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf2_translation', true);
+        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf_translation', true);
         $this->fs->mkdir($this->translationDir.'/translations');
         $this->fs->mkdir($this->translationDir.'/templates');
 
@@ -112,7 +112,7 @@ public function testDebugInvalidDirectory()
     protected function setUp()
     {
         $this->fs = new Filesystem();
-        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf2_translation', true);
+        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf_translation', true);
         $this->fs->mkdir($this->translationDir.'/Resources/translations');
         $this->fs->mkdir($this->translationDir.'/Resources/views');
         $this->fs->mkdir($this->translationDir.'/translations');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php
@@ -34,7 +34,7 @@ public function testDumpMessagesAndClean()
     public function testDumpMessagesAndCleanInRootDirectory()
     {
         $this->fs->remove($this->translationDir);
-        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf2_translation', true);
+        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf_translation', true);
         $this->fs->mkdir($this->translationDir.'/translations');
         $this->fs->mkdir($this->translationDir.'/templates');
 
@@ -71,7 +71,7 @@ public function testWriteMessages()
     public function testWriteMessagesInRootDirectory()
     {
         $this->fs->remove($this->translationDir);
-        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf2_translation', true);
+        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf_translation', true);
         $this->fs->mkdir($this->translationDir.'/translations');
         $this->fs->mkdir($this->translationDir.'/templates');
 
@@ -90,7 +90,7 @@ public function testWriteMessagesForSpecificDomain()
     protected function setUp()
     {
         $this->fs = new Filesystem();
-        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf2_translation', true);
+        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf_translation', true);
         $this->fs->mkdir($this->translationDir.'/Resources/translations');
         $this->fs->mkdir($this->translationDir.'/Resources/views');
         $this->fs->mkdir($this->translationDir.'/translations');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
@@ -24,7 +24,7 @@ class TranslatorTest extends TestCase
 
     protected function setUp()
     {
-        $this->tmpDir = sys_get_temp_dir().'/sf2_translation';
+        $this->tmpDir = sys_get_temp_dir().'/sf_translation';
         $this->deleteTmpDir();
     }
 
diff --git a/src/Symfony/Component/Form/Tests/CompoundFormTest.php b/src/Symfony/Component/Form/Tests/CompoundFormTest.php
@@ -595,7 +595,7 @@ public function requestMethodProvider()
      */
     public function testSubmitPostOrPutRequest($method)
     {
-        $path = tempnam(sys_get_temp_dir(), 'sf2');
+        $path = tempnam(sys_get_temp_dir(), 'sf');
         touch($path);
         file_put_contents($path, 'zaza');
         $values = array(
@@ -643,7 +643,7 @@ public function testSubmitPostOrPutRequest($method)
      */
     public function testSubmitPostOrPutRequestWithEmptyRootFormName($method)
     {
-        $path = tempnam(sys_get_temp_dir(), 'sf2');
+        $path = tempnam(sys_get_temp_dir(), 'sf');
         touch($path);
         file_put_contents($path, 'zaza');
 
@@ -691,7 +691,7 @@ public function testSubmitPostOrPutRequestWithEmptyRootFormName($method)
      */
     public function testSubmitPostOrPutRequestWithSingleChildForm($method)
     {
-        $path = tempnam(sys_get_temp_dir(), 'sf2');
+        $path = tempnam(sys_get_temp_dir(), 'sf');
         touch($path);
         file_put_contents($path, 'zaza');
 
@@ -728,7 +728,7 @@ public function testSubmitPostOrPutRequestWithSingleChildForm($method)
      */
     public function testSubmitPostOrPutRequestWithSingleChildFormUploadedFile($method)
     {
-        $path = tempnam(sys_get_temp_dir(), 'sf2');
+        $path = tempnam(sys_get_temp_dir(), 'sf');
         touch($path);
         file_put_contents($path, 'zaza');
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/AttributeBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/AttributeBagTest.php
@@ -45,7 +45,7 @@ protected function setUp()
                 ),
             ),
         );
-        $this->bag = new AttributeBag('_sf2');
+        $this->bag = new AttributeBag('_sf');
         $this->bag->initialize($this->array);
     }
 
@@ -67,7 +67,7 @@ public function testInitialize()
 
     public function testGetStorageKey()
     {
-        $this->assertEquals('_sf2', $this->bag->getStorageKey());
+        $this->assertEquals('_sf', $this->bag->getStorageKey());
         $attributeBag = new AttributeBag('test');
         $this->assertEquals('test', $attributeBag->getStorageKey());
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -45,7 +45,7 @@ protected function setUp()
             'data_field' => 'data',
             'time_field' => 'time',
             'expiry_field' => 'expires_at',
-            'database' => 'sf2-test',
+            'database' => 'sf-test',
             'collection' => 'session-test',
         );
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -33,7 +33,7 @@ protected function tearDown()
 
     protected function getPersistentSqliteDsn()
     {
-        $this->dbFile = tempnam(sys_get_temp_dir(), 'sf2_sqlite_sessions');
+        $this->dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_sessions');
 
         return 'sqlite:'.$this->dbFile;
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockFileSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockFileSessionStorageTest.php
@@ -35,7 +35,7 @@ class MockFileSessionStorageTest extends TestCase
 
     protected function setUp()
     {
-        $this->sessionDir = sys_get_temp_dir().'/sf2test';
+        $this->sessionDir = sys_get_temp_dir().'/sftest';
         $this->storage = $this->getStorage();
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -36,7 +36,7 @@ class NativeSessionStorageTest extends TestCase
     protected function setUp()
     {
         $this->iniSet('session.save_handler', 'files');
-        $this->iniSet('session.save_path', $this->savePath = sys_get_temp_dir().'/sf2test');
+        $this->iniSet('session.save_path', $this->savePath = sys_get_temp_dir().'/sftest');
         if (!is_dir($this->savePath)) {
             mkdir($this->savePath);
         }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
@@ -32,7 +32,7 @@ class PhpBridgeSessionStorageTest extends TestCase
     protected function setUp()
     {
         $this->iniSet('session.save_handler', 'files');
-        $this->iniSet('session.save_path', $this->savePath = sys_get_temp_dir().'/sf2test');
+        $this->iniSet('session.save_path', $this->savePath = sys_get_temp_dir().'/sftest');
         if (!is_dir($this->savePath)) {
             mkdir($this->savePath);
         }
diff --git a/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php b/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php
@@ -20,7 +20,7 @@ class ChainCacheClearerTest extends TestCase
 
     public static function setUpBeforeClass()
     {
-        self::$cacheDir = tempnam(sys_get_temp_dir(), 'sf2_cache_clearer_dir');
+        self::$cacheDir = tempnam(sys_get_temp_dir(), 'sf_cache_clearer_dir');
     }
 
     public static function tearDownAfterClass()
diff --git a/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php b/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
@@ -20,7 +20,7 @@ class CacheWarmerAggregateTest extends TestCase
 
     public static function setUpBeforeClass()
     {
-        self::$cacheDir = tempnam(sys_get_temp_dir(), 'sf2_cache_warmer_dir');
+        self::$cacheDir = tempnam(sys_get_temp_dir(), 'sf_cache_warmer_dir');
     }
 
     public static function tearDownAfterClass()
diff --git a/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php b/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php
@@ -20,7 +20,7 @@ class CacheWarmerTest extends TestCase
 
     public static function setUpBeforeClass()
     {
-        self::$cacheFile = tempnam(sys_get_temp_dir(), 'sf2_cache_warmer_dir');
+        self::$cacheFile = tempnam(sys_get_temp_dir(), 'sf_cache_warmer_dir');
     }
 
     public static function tearDownAfterClass()
diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php
@@ -22,7 +22,7 @@ class FileProfilerStorageTest extends TestCase
 
     protected function setUp()
     {
-        $this->tmpDir = sys_get_temp_dir().'/sf2_profiler_file_storage';
+        $this->tmpDir = sys_get_temp_dir().'/sf_profiler_file_storage';
         if (is_dir($this->tmpDir)) {
             self::cleanDir();
         }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/ProfilerTest.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/ProfilerTest.php
@@ -84,7 +84,7 @@ public function testFindWorksWithStatusCode()
 
     protected function setUp()
     {
-        $this->tmp = tempnam(sys_get_temp_dir(), 'sf2_profiler');
+        $this->tmp = tempnam(sys_get_temp_dir(), 'sf_profiler');
         if (file_exists($this->tmp)) {
             @unlink($this->tmp);
         }
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php b/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php
@@ -24,7 +24,7 @@ class TranslatorCacheTest extends TestCase
 
     protected function setUp()
     {
-        $this->tmpDir = sys_get_temp_dir().'/sf2_translation';
+        $this->tmpDir = sys_get_temp_dir().'/sf_translation';
         $this->deleteTmpDir();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected function setUp()`
`33`	`33`	`{`
`34`	`34`	`$this->fs = new Filesystem();`
`35`	`35`	`$this->kernel = new TestAppKernel('test', true);`
`36`		`- $this->rootDir = sys_get_temp_dir().\DIRECTORY_SEPARATOR.uniqid('sf2_cache_', true);`
	`36`	`+ $this->rootDir = sys_get_temp_dir().\DIRECTORY_SEPARATOR.uniqid('sf_cache_', true);`
`37`	`37`	`$this->kernel->setRootDir($this->rootDir);`
`38`	`38`	`$this->fs->mkdir($this->rootDir);`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class TranslatorTest extends TestCase`
`24`	`24`
`25`	`25`	`protected function setUp()`
`26`	`26`	`{`
`27`		`- $this->tmpDir = sys_get_temp_dir().'/sf2_translation';`
	`27`	`+ $this->tmpDir = sys_get_temp_dir().'/sf_translation';`
`28`	`28`	`$this->deleteTmpDir();`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected function setUp()`
`45`	`45`	`),`
`46`	`46`	`),`
`47`	`47`	`);`
`48`		`- $this->bag = new AttributeBag('_sf2');`
	`48`	`+ $this->bag = new AttributeBag('_sf');`
`49`	`49`	`$this->bag->initialize($this->array);`
`50`	`50`	`}`
`51`	`51`
`@@ -67,7 +67,7 @@ public function testInitialize()`
`67`	`67`
`68`	`68`	`public function testGetStorageKey()`
`69`	`69`	`{`
`70`		`- $this->assertEquals('_sf2', $this->bag->getStorageKey());`
	`70`	`+ $this->assertEquals('_sf', $this->bag->getStorageKey());`
`71`	`71`	`$attributeBag = new AttributeBag('test');`
`72`	`72`	`$this->assertEquals('test', $attributeBag->getStorageKey());`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected function tearDown()`
`33`	`33`
`34`	`34`	`protected function getPersistentSqliteDsn()`
`35`	`35`	`{`
`36`		`- $this->dbFile = tempnam(sys_get_temp_dir(), 'sf2_sqlite_sessions');`
	`36`	`+ $this->dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_sessions');`
`37`	`37`
`38`	`38`	`return 'sqlite:'.$this->dbFile;`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class MockFileSessionStorageTest extends TestCase`
`35`	`35`
`36`	`36`	`protected function setUp()`
`37`	`37`	`{`
`38`		`- $this->sessionDir = sys_get_temp_dir().'/sf2test';`
	`38`	`+ $this->sessionDir = sys_get_temp_dir().'/sftest';`
`39`	`39`	`$this->storage = $this->getStorage();`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class NativeSessionStorageTest extends TestCase`
`36`	`36`	`protected function setUp()`
`37`	`37`	`{`
`38`	`38`	`$this->iniSet('session.save_handler', 'files');`
`39`		`- $this->iniSet('session.save_path', $this->savePath = sys_get_temp_dir().'/sf2test');`
	`39`	`+ $this->iniSet('session.save_path', $this->savePath = sys_get_temp_dir().'/sftest');`
`40`	`40`	`if (!is_dir($this->savePath)) {`
`41`	`41`	`mkdir($this->savePath);`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class PhpBridgeSessionStorageTest extends TestCase`
`32`	`32`	`protected function setUp()`
`33`	`33`	`{`
`34`	`34`	`$this->iniSet('session.save_handler', 'files');`
`35`		`- $this->iniSet('session.save_path', $this->savePath = sys_get_temp_dir().'/sf2test');`
	`35`	`+ $this->iniSet('session.save_path', $this->savePath = sys_get_temp_dir().'/sftest');`
`36`	`36`	`if (!is_dir($this->savePath)) {`
`37`	`37`	`mkdir($this->savePath);`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class ChainCacheClearerTest extends TestCase`
`20`	`20`
`21`	`21`	`public static function setUpBeforeClass()`
`22`	`22`	`{`
`23`		`- self::$cacheDir = tempnam(sys_get_temp_dir(), 'sf2_cache_clearer_dir');`
	`23`	`+ self::$cacheDir = tempnam(sys_get_temp_dir(), 'sf_cache_clearer_dir');`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public static function tearDownAfterClass()`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class CacheWarmerAggregateTest extends TestCase`
`20`	`20`
`21`	`21`	`public static function setUpBeforeClass()`
`22`	`22`	`{`
`23`		`- self::$cacheDir = tempnam(sys_get_temp_dir(), 'sf2_cache_warmer_dir');`
	`23`	`+ self::$cacheDir = tempnam(sys_get_temp_dir(), 'sf_cache_warmer_dir');`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public static function tearDownAfterClass()`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class CacheWarmerTest extends TestCase`
`20`	`20`
`21`	`21`	`public static function setUpBeforeClass()`
`22`	`22`	`{`
`23`		`- self::$cacheFile = tempnam(sys_get_temp_dir(), 'sf2_cache_warmer_dir');`
	`23`	`+ self::$cacheFile = tempnam(sys_get_temp_dir(), 'sf_cache_warmer_dir');`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public static function tearDownAfterClass()`