Merge branch '8.5' into 9.5

Author: sebastianbergmann

tests/end-to-end/phar/phpunit.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="../../phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="../../../phpunit.xsd"
          bootstrap="src/autoload.php"
          failOnRisky="true"
          failOnWarning="true">