Merge branch '8.5' into 9.5

sebastianbergmann · Aug 30, 2021 · 388d57b · 388d57b
2 parents ec22fa2 + 737772d
commit 388d57b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="phpab" version="^1.25" installed="1.26.3" location="./tools/phpab" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.0" installed="3.0.2" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.0" installed="3.1.0" 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.9.3" location="./tools/psalm" copy="true"/>

diff --git a/tools/php-cs-fixer b/tools/php-cs-fixer