Merge branch '8.5' into 9.4

Author: sebastianbergmann

.phive/phars.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpab" version="^1.25" installed="1.25.9" location="./tools/phpab" copy="true"/>
-  <phar name="php-cs-fixer" version="^2.16" installed="2.16.4" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="phpab" version="^1.25" installed="1.26.0" location="./tools/phpab" copy="true"/>
+  <phar name="php-cs-fixer" version="^2.16" installed="2.16.7" location="./tools/php-cs-fixer" copy="true"/>
   <phar name="phpdox" version="^0.12" installed="0.12.0" location="./tools/phpdox" copy="true"/>
   <phar name="phploc" version="^4.0" installed="4.0.1" location="./tools/phploc" copy="true"/>
   <phar name="psalm" version="^4.0" installed="4.0.1" location="./tools/psalm" copy="true"/>
   <phar name="humbug/php-scoper" version="^0.13.2" installed="0.13.5" location="./tools/php-scoper" copy="true"/>
   <phar name="roave/backwardcompatibilitycheck" version="^5.0.0" installed="5.0.0" location="./tools/roave-backward-compatibility-check" copy="true"/>
+  <phar name="composer" version="^2.0.3" installed="2.0.3" location="./tools/composer" copy="true"/>
 </phive>

build.xml

@@ -462,10 +462,6 @@
             <arg value="update"/>
             <arg value="--force-accept-unsigned"/>
         </exec>
-
-        <exec executable="${basedir}/tools/composer">
-            <arg value="self-update"/>
-        </exec>
     </target>
 
     <target name="generate-global-assert-wrappers" description="Generate global function wrappers for static methods in Assert and TestCase that are commonly used">