Merge branch '8.5' into 9.5

sebastianbergmann · Nov 30, 2022 · a4246d5 · a4246d5
2 parents 586c71b + bd77686
commit a4246d5
Show file tree

Hide file tree

Showing 26 changed files with 303 additions and 92 deletions.
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -2,7 +2,7 @@
 <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.13.0" location="./tools/php-cs-fixer" copy="true"/>
-  <phar name="psalm" version="^4.0" installed="4.30.0" location="./tools/psalm" copy="true"/>
+  <phar name="psalm" version="^5.0" installed="5.0.0" location="./tools/psalm" copy="true"/>
   <phar name="humbug/php-scoper" version="^0.17.0" installed="0.17.7" location="./tools/php-scoper" copy="true"/>
   <phar name="composer" version="^2.0.3" installed="2.4.4" location="./tools/composer" copy="true"/>
 </phive>