Merge branch '8.5' into 9.1

sebastianbergmann · Apr 13, 2020 · 446da18 · 446da18
2 parents b255672 + 7482fe2
commit 446da18
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/phive.xml b/phive.xml
@@ -4,5 +4,5 @@
   <phar name="php-cs-fixer" version="^2.16" installed="2.16.2" 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="^3.6" installed="3.11.1" location="./tools/psalm" copy="true"/>
+  <phar name="psalm" version="^3.6" installed="3.11.2" location="./tools/psalm" copy="true"/>
 </phive>
diff --git a/tools/psalm b/tools/psalm