Merge branch '8.5' into 9.5

Author: sebastianbergmann

.github/workflows/ci.yml

@@ -258,8 +258,8 @@ jobs:
         with:
           java-version: 1.8
 
-      - name: Run PHAR-specific end-to-end tests
-        run: ant run-phar-specific-tests
+      - name: Build PHAR and run the PHAR-specific tests with it
+        run: ant build-phar-and-run-phar-specific-tests
 
       - uses: actions/upload-artifact@v2
         if: ${{ matrix.php-version == 8.1 }}

build.xml

@@ -425,10 +425,14 @@
         <exec executable="${basedir}/build/scripts/version.php" outputproperty="version" failonerror="true" />
     </target>
 
-    <target name="run-phar-specific-tests" depends="clean,phar-snapshot" description="Build snapshot PHAR and run the PHAR-specific tests with it">
+    <target name="build-phar-and-run-phar-specific-tests" depends="clean,phar-snapshot" description="Build PHAR and run the PHAR-specific tests with it">
         <delete dir="${basedir}/vendor"/>
         <delete file="${basedir}/composer.lock"/>
 
+        <antcall target="run-phar-specific-tests"/>
+    </target>
+
+    <target name="run-phar-specific-tests" description="Run the PHAR-specific tests with it (expects build/artifacts/phpunit-snapshot.phar to exist)">
         <exec executable="${basedir}/build/artifacts/phpunit-snapshot.phar" taskname="phpunit" failonerror="true">
             <arg value="--configuration" />
             <arg value="tests/phar/phpunit.xml" />