removed sf2 references

fabpot · fabpot · commit 1b0265417ba3 · 2017-08-22T13:48:27.000-07:00
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig
@@ -24,7 +24,7 @@
 
         var noop = function() {};
 
-        var profilerStorageKey = 'sf2/profiler/';
+        var profilerStorageKey = 'symfony/profiler/';
 
         var request = function(url, onSuccess, onError, payload, options) {
             var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP');
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
@@ -24,7 +24,7 @@
 
         var noop = function() {};
 
-        var profilerStorageKey = 'sf2/profiler/';
+        var profilerStorageKey = 'symfony/profiler/';
 
         var request = function(url, onSuccess, onError, payload, options) {
             var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP');
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -597,7 +597,7 @@ public function validateSchema(\DOMDocument $dom)
         foreach ($schemaLocations as $namespace => $location) {
             $parts = explode('/', $location);
             if (0 === stripos($location, 'phar://')) {
-                $tmpfile = tempnam(sys_get_temp_dir(), 'sf2');
+                $tmpfile = tempnam(sys_get_temp_dir(), 'symfony');
                 if ($tmpfile) {
                     copy($location, $tmpfile);
                     $tmpfiles[] = $tmpfile;
diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php b/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php
@@ -39,7 +39,7 @@ class AutoExpireFlashBag implements FlashBagInterface
      *
      * @param string $storageKey The key used to store flashes in the session
      */
-    public function __construct($storageKey = '_sf2_flashes')
+    public function __construct($storageKey = '_symfony_flashes')
     {
         $this->storageKey = $storageKey;
     }
diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php
@@ -39,7 +39,7 @@ class FlashBag implements FlashBagInterface
      *
      * @param string $storageKey The key used to store flashes in the session
      */
-    public function __construct($storageKey = '_sf2_flashes')
+    public function __construct($storageKey = '_symfony_flashes')
     {
         $this->storageKey = $storageKey;
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/AutoExpireFlashBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/AutoExpireFlashBagTest.php
@@ -62,7 +62,7 @@ public function testInitialize()
 
     public function testGetStorageKey()
     {
-        $this->assertEquals('_sf2_flashes', $this->bag->getStorageKey());
+        $this->assertEquals('_symfony_flashes', $this->bag->getStorageKey());
         $attributeBag = new FlashBag('test');
         $this->assertEquals('test', $attributeBag->getStorageKey());
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php
@@ -57,7 +57,7 @@ public function testInitialize()
 
     public function testGetStorageKey()
     {
-        $this->assertEquals('_sf2_flashes', $this->bag->getStorageKey());
+        $this->assertEquals('_symfony_flashes', $this->bag->getStorageKey());
         $attributeBag = new FlashBag('test');
         $this->assertEquals('test', $attributeBag->getStorageKey());
     }
diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
@@ -222,7 +222,7 @@ private function fixXmlLocation($schemaSource, $xmlUri)
         $newPath = str_replace('\\', '/', __DIR__).'/schema/dic/xliff-core/xml.xsd';
         $parts = explode('/', $newPath);
         if (0 === stripos($newPath, 'phar://')) {
-            $tmpfile = tempnam(sys_get_temp_dir(), 'sf2');
+            $tmpfile = tempnam(sys_get_temp_dir(), 'symfony');
             if ($tmpfile) {
                 copy($newPath, $tmpfile);
                 $parts = explode('/', str_replace('\\', '/', $tmpfile));

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class AutoExpireFlashBag implements FlashBagInterface`
`39`	`39`	`*`
`40`	`40`	`* @param string $storageKey The key used to store flashes in the session`
`41`	`41`	`*/`
`42`		`- public function __construct($storageKey = '_sf2_flashes')`
	`42`	`+ public function __construct($storageKey = '_symfony_flashes')`
`43`	`43`	`{`
`44`	`44`	`$this->storageKey = $storageKey;`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class FlashBag implements FlashBagInterface`
`39`	`39`	`*`
`40`	`40`	`* @param string $storageKey The key used to store flashes in the session`
`41`	`41`	`*/`
`42`		`- public function __construct($storageKey = '_sf2_flashes')`
	`42`	`+ public function __construct($storageKey = '_symfony_flashes')`
`43`	`43`	`{`
`44`	`44`	`$this->storageKey = $storageKey;`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function testInitialize()`
`62`	`62`
`63`	`63`	`public function testGetStorageKey()`
`64`	`64`	`{`
`65`		`- $this->assertEquals('_sf2_flashes', $this->bag->getStorageKey());`
	`65`	`+ $this->assertEquals('_symfony_flashes', $this->bag->getStorageKey());`
`66`	`66`	`$attributeBag = new FlashBag('test');`
`67`	`67`	`$this->assertEquals('test', $attributeBag->getStorageKey());`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function testInitialize()`
`57`	`57`
`58`	`58`	`public function testGetStorageKey()`
`59`	`59`	`{`
`60`		`- $this->assertEquals('_sf2_flashes', $this->bag->getStorageKey());`
	`60`	`+ $this->assertEquals('_symfony_flashes', $this->bag->getStorageKey());`
`61`	`61`	`$attributeBag = new FlashBag('test');`
`62`	`62`	`$this->assertEquals('test', $attributeBag->getStorageKey());`
`63`	`63`	`}`