Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit e8bb73c

Browse filesBrowse files
fabpotfabpot
committed
feature #23936 Remove some sf2 references (fabpot)
This PR was merged into the 3.4 branch. Discussion ---------- Remove some sf2 references | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Those `sf2` references can be safely remove and changed to `symfony` as there are internal or they don't break anything when upgrading Symfony's version: * Flashes are ephemeral, so changing the key in the session is not a problem; * Changing the local storage key for the profiler is not an issue as this is a dev tool. Commits ------- 1b02654 removed sf2 references
2 parents 85f03e1 + 1b02654 commit e8bb73c
Copy full SHA for e8bb73c

File tree

8 files changed

+8
-8
lines changed
Filter options

8 files changed

+8
-8
lines changed

‎src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
2525
var noop = function() {};
2626
27-
var profilerStorageKey = 'sf2/profiler/';
27+
var profilerStorageKey = 'symfony/profiler/';
2828
2929
var request = function(url, onSuccess, onError, payload, options) {
3030
var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP');

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
2525
var noop = function() {};
2626
27-
var profilerStorageKey = 'sf2/profiler/';
27+
var profilerStorageKey = 'symfony/profiler/';
2828
2929
var request = function(url, onSuccess, onError, payload, options) {
3030
var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP');

‎src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ public function validateSchema(\DOMDocument $dom)
597597
foreach ($schemaLocations as $namespace => $location) {
598598
$parts = explode('/', $location);
599599
if (0 === stripos($location, 'phar://')) {
600-
$tmpfile = tempnam(sys_get_temp_dir(), 'sf2');
600+
$tmpfile = tempnam(sys_get_temp_dir(), 'symfony');
601601
if ($tmpfile) {
602602
copy($location, $tmpfile);
603603
$tmpfiles[] = $tmpfile;

‎src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class AutoExpireFlashBag implements FlashBagInterface
3939
*
4040
* @param string $storageKey The key used to store flashes in the session
4141
*/
42-
public function __construct($storageKey = '_sf2_flashes')
42+
public function __construct($storageKey = '_symfony_flashes')
4343
{
4444
$this->storageKey = $storageKey;
4545
}

‎src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class FlashBag implements FlashBagInterface
3939
*
4040
* @param string $storageKey The key used to store flashes in the session
4141
*/
42-
public function __construct($storageKey = '_sf2_flashes')
42+
public function __construct($storageKey = '_symfony_flashes')
4343
{
4444
$this->storageKey = $storageKey;
4545
}

‎src/Symfony/Component/HttpFoundation/Tests/Session/Flash/AutoExpireFlashBagTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/Session/Flash/AutoExpireFlashBagTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function testInitialize()
6262

6363
public function testGetStorageKey()
6464
{
65-
$this->assertEquals('_sf2_flashes', $this->bag->getStorageKey());
65+
$this->assertEquals('_symfony_flashes', $this->bag->getStorageKey());
6666
$attributeBag = new FlashBag('test');
6767
$this->assertEquals('test', $attributeBag->getStorageKey());
6868
}

‎src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function testInitialize()
5757

5858
public function testGetStorageKey()
5959
{
60-
$this->assertEquals('_sf2_flashes', $this->bag->getStorageKey());
60+
$this->assertEquals('_symfony_flashes', $this->bag->getStorageKey());
6161
$attributeBag = new FlashBag('test');
6262
$this->assertEquals('test', $attributeBag->getStorageKey());
6363
}

‎src/Symfony/Component/Translation/Loader/XliffFileLoader.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Loader/XliffFileLoader.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ private function fixXmlLocation($schemaSource, $xmlUri)
222222
$newPath = str_replace('\\', '/', __DIR__).'/schema/dic/xliff-core/xml.xsd';
223223
$parts = explode('/', $newPath);
224224
if (0 === stripos($newPath, 'phar://')) {
225-
$tmpfile = tempnam(sys_get_temp_dir(), 'sf2');
225+
$tmpfile = tempnam(sys_get_temp_dir(), 'symfony');
226226
if ($tmpfile) {
227227
copy($newPath, $tmpfile);
228228
$parts = explode('/', str_replace('\\', '/', $tmpfile));

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.