Merge branch '11.5' into 12.2

Author: sebastianbergmann

.phive/phars.xml

@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="phpab" version="^1.29" installed="1.29.3" location="./tools/phpab" copy="true"/>
+<<<<<<< HEAD
   <phar name="php-cs-fixer" version="^3.69" installed="3.76.0" location="./tools/php-cs-fixer" copy="true"/>
+||||||| 3baeefe56
+  <phar name="php-cs-fixer" version="^3.70" installed="3.76.0" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="psalm" version="^5.26" installed="5.26.1" location="./tools/psalm" copy="true"/>
+=======
+  <phar name="php-cs-fixer" version="^3.77" installed="3.77.0" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="psalm" version="^5.26" installed="5.26.1" location="./tools/psalm" copy="true"/>
+>>>>>>> 10.5
   <phar name="humbug/php-scoper" version="^0.18" installed="0.18.17" location="./tools/php-scoper" copy="true"/>
   <phar name="composer" version="^2.8" installed="2.8.9" location="./tools/composer" copy="true"/>
 </phive>