Also run end-to-end tests using unscoped PHAR

.github/workflows/ci.yml

@@ -245,7 +245,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

@@ -437,17 +437,15 @@
             <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>
 
         <delete dir="${basedir}/vendor"/>
         <delete file="${basedir}/composer.lock"/>
 
-        <exec executable="${basedir}/build/artifacts/phpunit-snapshot.phar" taskname="phpunit" failonerror="true">
-            <arg value="--testsuite" />
-            <arg value="unit" />
-        </exec>
+        <exec executable="${basedir}/build/artifacts/phpunit-snapshot.phar" taskname="phpunit" failonerror="true" />
 
         <delete file="${basedir}/tests/autoload.php"/>
     </target>

tests/bootstrap.php

@@ -27,7 +27,7 @@
 
 if (file_exists(__DIR__ . '/autoload.php')) {
     if (!defined('__PHPUNIT_PHAR__')) {
-        define('__PHPUNIT_PHAR__', realpath($_SERVER['_']));
+        require_once __DIR__ . '/../build/artifacts/phpunit-snapshot.phar';
     }
 
     require_once __DIR__ . '/autoload.php';