Merge branch '8.5' into 9.5

Author: sebastianbergmann

.github/workflows/ci.yml

@@ -252,7 +252,7 @@ jobs:
         with:
           java-version: 1.8
 
-      - name: Run regular unit tests with unscoped PHAR
+      - name: Run regular test suite with unscoped PHAR
         run: ant run-regular-tests-with-unscoped-phar
 
       - name: Run PHAR-specific end-to-end tests with scoped PHAR

build.xml

@@ -454,6 +454,7 @@
             <arg value="--output" />
             <arg path="${basedir}/tests/autoload.php" />
             <arg path="${basedir}/tests/_files" />
+            <arg path="${basedir}/tests/end-to-end/_files" />
             <arg path="${basedir}/tests/end-to-end/execution-order/_files" />
             <arg path="${basedir}/tests/unit" />
         </exec>

tests/bootstrap.php

@@ -9,25 +9,32 @@
  */
 const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR;
 
-if (file_exists(__DIR__ . '/../vendor/autoload.php') && file_exists(__DIR__ . '/autoload.php')) {
-    print 'More than one test fixture autoloader is available, exiting.' . \PHP_EOL;
+$composer = file_exists(__DIR__ . '/../vendor/autoload.php');
+$phar     = file_exists(__DIR__ . '/autoload.php');
+
+if ($composer && $phar) {
+    print 'More than one test fixture autoloader is available, exiting.' . PHP_EOL;
+
+    exit(1);
+}
+
+if (!$composer && !$phar) {
+    print 'No test fixture autoloader was registered, exiting.' . PHP_EOL;
 
     exit(1);
 }
 
-if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
+if ($composer) {
     if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
         define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__) . '/vendor/autoload.php');
     }
 
     require_once __DIR__ . '/../vendor/autoload.php';
-
-    return;
 }
 
-if (file_exists(__DIR__ . '/autoload.php')) {
+if ($phar) {
     if (!defined('__PHPUNIT_PHAR__')) {
-        define('__PHPUNIT_PHAR__', realpath($_SERVER['_']));
+        require_once __DIR__ . '/../build/artifacts/phpunit-snapshot.phar';
     }
 
     require_once __DIR__ . '/autoload.php';
@@ -38,12 +45,6 @@
     foreach (json_decode(file_get_contents($jsonFile), true)['autoload-dev']['files'] as $file) {
         require_once $base . DIRECTORY_SEPARATOR . $file;
     }
-
-    unset($jsonFile, $base, $file);
-
-    return;
 }
 
-print 'No test fixture autoloader was registered, exiting.' . \PHP_EOL;
-
-exit(1);
+unset($composer, $phar, $jsonFile, $base, $file);