Merge branch '8.5' into 9.6

sebastianbergmann · Feb 8, 2024 · 2baf0e4 · 2baf0e4
2 parents a34291c + b2aec1f
commit 2baf0e4
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.29.0" location="./tools/phpab" copy="true"/>
- <phar name="php-cs-fixer" version="^3.0" installed="3.48.0" location="./tools/php-cs-fixer" copy="true"/>
- <phar name="psalm" version="^5.0" installed="5.21.0" location="./tools/psalm" copy="true"/>
+ <phar name="php-cs-fixer" version="^3.0" installed="3.49.0" location="./tools/php-cs-fixer" copy="true"/>
+ <phar name="psalm" version="^5.0" installed="5.21.1" location="./tools/psalm" copy="true"/>
  <phar name="humbug/php-scoper" version="^0.18" installed="0.18.11" location="./tools/php-scoper" copy="true"/>
  <phar name="composer" version="^2.0.3" installed="2.6.6" 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