Merge branch '8.5' into 9.6

Author: sebastianbergmann

tests/end-to-end/_files/phpt-env.expected.txt

@@ -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