Merge branch '8.5' into 9.5

sebastianbergmann · Oct 13, 2022 · b24fb30 · b24fb30
2 parents a84ab3b + 7792976
commit b24fb30
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="phpab" version="^1.25" installed="1.27.1" location="./tools/phpab" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.0" installed="3.11.0" location="./tools/php-cs-fixer" copy="true"/>
-  <phar name="psalm" version="^4.0" installed="4.28.0" location="./tools/psalm" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.0" installed="3.12.0" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="psalm" version="^4.0" installed="4.29.0" location="./tools/psalm" copy="true"/>
   <phar name="humbug/php-scoper" version="^0.17.0" installed="0.17.6" location="./tools/php-scoper" copy="true"/>
   <phar name="composer" version="^2.0.3" installed="2.4.2" location="./tools/composer" copy="true"/>
 </phive>
diff --git a/tools/php-cs-fixer b/tools/php-cs-fixer
diff --git a/tools/psalm b/tools/psalm