Skip to content

Commit 6048811

Browse files
committed
Merge branch '7.2' into 7.3
* 7.2: fix EmojiTransliterator return type compatibility with PHP 8.5 Bump Symfony version to 7.2.7 Update VERSION for 7.2.6 Update CHANGELOG for 7.2.6 Bump Symfony version to 6.4.22 Update VERSION for 6.4.21 Update CONTRIBUTORS for 6.4.21 Update CHANGELOG for 6.4.21 Fix return type is non-nullable Fix overwriting an array element
2 parents abbe5fa + c665ed9 commit 6048811

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

Tests/RequestTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,6 @@ public function testGetUri()
589589

590590
$server['REDIRECT_QUERY_STRING'] = 'query=string';
591591
$server['REDIRECT_URL'] = '/path/info';
592-
$server['SCRIPT_NAME'] = '/index.php';
593592
$server['QUERY_STRING'] = 'query=string';
594593
$server['REQUEST_URI'] = '/path/info?toto=test&1=1';
595594
$server['SCRIPT_NAME'] = '/index.php';
@@ -716,7 +715,6 @@ public function testGetUriForPath()
716715

717716
$server['REDIRECT_QUERY_STRING'] = 'query=string';
718717
$server['REDIRECT_URL'] = '/path/info';
719-
$server['SCRIPT_NAME'] = '/index.php';
720718
$server['QUERY_STRING'] = 'query=string';
721719
$server['REQUEST_URI'] = '/path/info?toto=test&1=1';
722720
$server['SCRIPT_NAME'] = '/index.php';

0 commit comments

Comments
 (0)