We do not ship unscoped PHARs (anymore), so there is not really a point in building and testing them

Author: sebastianbergmann

.github/workflows/ci.yml

@@ -246,11 +246,8 @@ jobs:
         with:
           java-version: 1.8
 
-      - 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
-        run: ant run-phar-specific-tests-with-scoped-phar
+      - name: Run PHAR-specific end-to-end tests
+        run: ant run-phar-specific-tests
 
       - uses: actions/upload-artifact@v2
         if: ${{ matrix.php-version == 8.1 }}

build.xml

@@ -115,28 +115,12 @@
     <target name="phar" depends="-phar-prepare,-phar-determine-version" description="Create PHAR archive of PHPUnit and all its dependencies">
         <antcall target="-phar-build">
             <param name="type" value="release"/>
-            <param name="scope" value="true"/>
-        </antcall>
-    </target>
-
-    <target name="unscoped-phar" depends="-phar-prepare,-phar-determine-version" description="Create unscoped PHAR archive of PHPUnit and all its dependencies">
-        <antcall target="-phar-build">
-            <param name="type" value="release"/>
-            <param name="scope" value="false"/>
         </antcall>
     </target>
 
     <target name="phar-snapshot" depends="-phar-prepare" description="Create PHAR archive of PHPUnit and all its dependencies (snapshot)">
         <antcall target="-phar-build">
             <param name="type" value="snapshot"/>
-            <param name="scope" value="true"/>
-        </antcall>
-    </target>
-
-    <target name="unscoped-phar-snapshot" depends="-phar-prepare" description="Create unscoped PHAR archive of PHPUnit and all its dependencies (snapshot)">
-        <antcall target="-phar-build">
-            <param name="type" value="snapshot"/>
-            <param name="scope" value="false"/>
         </antcall>
     </target>
 
@@ -365,12 +349,24 @@
             <arg value="${type}"/>
         </exec>
 
-        <antcall target="-phar-scope" if:true="${scope}"/>
-        <copy todir="${basedir}/build/tmp/phar-scoped" unless:true="${scope}">
-            <fileset dir="${basedir}/build/tmp/phar">
-                <include name="**/*" />
-            </fileset>
-        </copy>
+        <exec executable="${basedir}/tools/php-scoper" taskname="php-scoper">
+            <arg value="add-prefix" />
+            <arg value="--no-ansi" />
+            <arg value="--force" />
+            <arg value="--config" />
+            <arg path="${basedir}/build/config/php-scoper.php" />
+            <arg value="--no-interaction" />
+            <arg value="--stop-on-failure" />
+            <arg value="--output-dir" />
+            <arg path="${basedir}/build/tmp/phar-scoped" />
+            <arg value="--prefix" />
+            <arg value="PHPUnit" />
+            <arg path="${basedir}/build/tmp/phar" />
+        </exec>
+
+        <replace file="${basedir}/build/tmp/phar-scoped/phpunit/Util/PHP/Template/PhptTestCase.tpl" token="SebastianBergmann\CodeCoverage\CodeCoverage" value="PHPUnit\SebastianBergmann\CodeCoverage\CodeCoverage"/>
+        <replace file="${basedir}/build/tmp/phar-scoped/phpunit/Util/PHP/Template/TestCaseClass.tpl" token="SebastianBergmann\CodeCoverage\CodeCoverage" value="PHPUnit\SebastianBergmann\CodeCoverage\CodeCoverage"/>
+        <replace file="${basedir}/build/tmp/phar-scoped/phpunit/Util/PHP/Template/TestCaseMethod.tpl" token="SebastianBergmann\CodeCoverage\CodeCoverage" value="PHPUnit\SebastianBergmann\CodeCoverage\CodeCoverage"/>
 
         <copy file="${basedir}/.phpstorm.meta.php" tofile="${basedir}/build/tmp/phar-scoped/.phpstorm.meta.php"/>
 
@@ -407,53 +403,11 @@
         <delete dir="${basedir}/build/tmp"/>
     </target>
 
-    <target name="-phar-scope">
-        <exec executable="${basedir}/tools/php-scoper" taskname="php-scoper">
-            <arg value="add-prefix" />
-            <arg value="--no-ansi" />
-            <arg value="--force" />
-            <arg value="--config" />
-            <arg path="${basedir}/build/config/php-scoper.php" />
-            <arg value="--no-interaction" />
-            <arg value="--stop-on-failure" />
-            <arg value="--output-dir" />
-            <arg path="${basedir}/build/tmp/phar-scoped" />
-            <arg value="--prefix" />
-            <arg value="PHPUnit" />
-            <arg path="${basedir}/build/tmp/phar" />
-        </exec>
-
-        <replace file="${basedir}/build/tmp/phar-scoped/phpunit/Util/PHP/Template/PhptTestCase.tpl" token="SebastianBergmann\CodeCoverage\CodeCoverage" value="PHPUnit\SebastianBergmann\CodeCoverage\CodeCoverage"/>
-        <replace file="${basedir}/build/tmp/phar-scoped/phpunit/Util/PHP/Template/TestCaseClass.tpl" token="SebastianBergmann\CodeCoverage\CodeCoverage" value="PHPUnit\SebastianBergmann\CodeCoverage\CodeCoverage"/>
-        <replace file="${basedir}/build/tmp/phar-scoped/phpunit/Util/PHP/Template/TestCaseMethod.tpl" token="SebastianBergmann\CodeCoverage\CodeCoverage" value="PHPUnit\SebastianBergmann\CodeCoverage\CodeCoverage"/>
-    </target>
-
     <target name="-phar-determine-version">
         <exec executable="${basedir}/build/scripts/version.php" outputproperty="version" failonerror="true" />
     </target>
 
-    <target name="run-regular-tests-with-unscoped-phar" depends="clean,unscoped-phar-snapshot" description="Build unscoped PHAR snapshot and run the regular test suite with it">
-        <exec executable="${basedir}/tools/phpab" taskname="phpab" failonerror="true">
-            <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>
-
-        <delete file="${basedir}/tests/autoload.php"/>
-    </target>
-
-    <target name="run-phar-specific-tests-with-scoped-phar" depends="clean,phar-snapshot" description="Build scoped PHAR snapshot and run the PHAR-specific tests with it">
+    <target name="run-phar-specific-tests" depends="clean,phar-snapshot" description="Build snapshot PHAR and run the PHAR-specific tests with it">
         <delete dir="${basedir}/vendor"/>
         <delete file="${basedir}/composer.lock"/>