Merge branch '9.6' into 10.5

sebastianbergmann · Apr 18, 2024 · a66d142 · a66d142
2 parents c726f0d + 2f5cc67
commit a66d142
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/tests/end-to-end/_files/phpt-env.expected.txt b/tests/end-to-end/_files/phpt-env.expected.txt
diff --git a/tests/end-to-end/phpt/phpt-env.phpt b/tests/end-to-end/phpt/phpt-env.phpt
@@ -9,8 +9,6 @@ if (extension_loaded('xdebug')) {
 FOO=bar
 --FILE--
 <?php declare(strict_types=1);
-if (isset($_SERVER['FOO'])) {
-    \var_dump($_SERVER['FOO']);
-}
---EXPECTF_EXTERNAL--
-../_files/phpt-env.expected.txt
+print $_SERVER['FOO'];
+--EXPECT--
+bar