Merge branch '9.4' into master

Author: sebastianbergmann

.phive/phars.xml

@@ -4,8 +4,8 @@
   <phar name="php-cs-fixer" version="^2.16" installed="2.16.7" 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.0.1" location="./tools/psalm" copy="true"/>
-  <phar name="humbug/php-scoper" version="^0.13.2" installed="0.13.5" location="./tools/php-scoper" copy="true"/>
+  <phar name="psalm" version="^4.0" installed="4.1.0" location="./tools/psalm" copy="true"/>
+  <phar name="humbug/php-scoper" version="^0.13.2" installed="0.13.8" location="./tools/php-scoper" copy="true"/>
   <phar name="roave/backwardcompatibilitycheck" version="^5.0.0" installed="5.0.0" location="./tools/roave-backward-compatibility-check" copy="true"/>
   <phar name="composer" version="^2.0.3" installed="2.0.3" location="./tools/composer" copy="true"/>
 </phive>

.psalm/baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.0.1@b1e2e30026936ef8d5bf6a354d1c3959b6231f44">
+<files psalm-version="4.1.0@8929bde5354595dc61947b7e27cfe59db45e3bb0">
   <file src="src/Framework/Assert.php">
     <ArgumentTypeCoercion occurrences="2">
       <code>$actualElement-&gt;childNodes-&gt;item($i)</code>
@@ -1492,13 +1492,6 @@
       <code>$tooFewColumnsRequested</code>
     </UnusedVariable>
   </file>
-  <file src="src/TextUI/TestSuiteMapper.php">
-    <UnusedMethodCall occurrences="3">
-      <code>$configuration</code>
-      <code>$testSuiteConfiguration-&gt;directories()</code>
-      <code>$testSuiteConfiguration-&gt;files()</code>
-    </UnusedMethodCall>
-  </file>
   <file src="src/TextUI/XmlConfiguration/CodeCoverage/CodeCoverage.php">
     <PossiblyUnusedMethod occurrences="8">
       <code>clover</code>
@@ -1521,14 +1514,6 @@
       <code>$position</code>
     </PropertyNotSetInConstructor>
   </file>
-  <file src="src/TextUI/XmlConfiguration/CodeCoverage/FilterMapper.php">
-    <UnusedMethodCall occurrences="4">
-      <code>$configuration-&gt;directories()</code>
-      <code>$configuration-&gt;excludeDirectories()</code>
-      <code>$configuration-&gt;excludeFiles()</code>
-      <code>$configuration-&gt;files()</code>
-    </UnusedMethodCall>
-  </file>
   <file src="src/TextUI/XmlConfiguration/CodeCoverage/Report/Clover.php">
     <PossiblyUnusedMethod occurrences="1">
       <code>target</code>
@@ -1738,17 +1723,6 @@
       <code>$position</code>
     </PropertyNotSetInConstructor>
   </file>
-  <file src="src/TextUI/XmlConfiguration/PHP/PhpHandler.php">
-    <UnusedMethodCall occurrences="7">
-      <code>$constants</code>
-      <code>$includePaths</code>
-      <code>$iniSettings</code>
-      <code>$variables</code>
-      <code>$variables</code>
-      <code>$variables</code>
-      <code>$variables</code>
-    </UnusedMethodCall>
-  </file>
   <file src="src/TextUI/XmlConfiguration/PHP/Variable.php">
     <MissingParamType occurrences="1">
       <code>$value</code>
@@ -2165,12 +2139,6 @@
       <code>ensureOperatorIsValid</code>
     </UnusedMethodCall>
   </file>
-  <file src="src/Util/XdebugFilterScriptGenerator.php">
-    <UnusedMethodCall occurrences="2">
-      <code>$filter-&gt;directories()</code>
-      <code>$filter-&gt;files()</code>
-    </UnusedMethodCall>
-  </file>
   <file src="src/Util/Xml.php">
     <ArgumentTypeCoercion occurrences="1">
       <code>$item</code>