Merge branch '8.5' into 9.5

sebastianbergmann · Feb 23, 2022 · bbe73b9 · bbe73b9
2 parents 5e34d61 + 303d866
commit bbe73b9
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3 deletions.
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -4,7 +4,7 @@
   <phar name="php-cs-fixer" version="^3.0" installed="3.6.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.20.0" location="./tools/psalm" copy="true"/>
-  <phar name="humbug/php-scoper" version="^0.17.0" installed="0.17.0" location="./tools/php-scoper" copy="true"/>
+  <phar name="psalm" version="^4.0" installed="4.21.0" location="./tools/psalm" copy="true"/>
+  <phar name="humbug/php-scoper" version="^0.17.0" installed="0.17.2" location="./tools/php-scoper" copy="true"/>
   <phar name="composer" version="^2.0.3" installed="2.2.6" location="./tools/composer" copy="true"/>
 </phive>
diff --git a/.psalm/config.xml b/.psalm/config.xml
@@ -5,7 +5,6 @@
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     resolveFromConfigFile="false"
     cacheDirectory=".psalm/cache"
-    totallyTyped="false"
     checkForThrowsDocblock="true"
     findUnusedVariablesAndParams="false"
     findUnusedCode="false"

diff --git a/tools/php-scoper b/tools/php-scoper
diff --git a/tools/psalm b/tools/psalm