Merge branch '8.5' into 9.4

Author: sebastianbergmann

.phive/phars.xml

@@ -4,7 +4,7 @@
   <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.1.1" location="./tools/psalm" copy="true"/>
+  <phar name="psalm" version="^4.0" installed="4.2.1" location="./tools/psalm" copy="true"/>
   <phar name="humbug/php-scoper" version="^0.13.9" installed="0.13.9" 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.7" location="./tools/composer" copy="true"/>

.psalm/baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.1.1@16bfbd9224698bd738c665f33039fade2a1a3977">
+<files psalm-version="4.2.1@ea9cb72143b77e7520c52fa37290bd8d8bc88fd9">
   <file src="src/Framework/Assert.php">
     <ArgumentTypeCoercion occurrences="2">
       <code>$actualElement-&gt;childNodes-&gt;item($i)</code>
@@ -11,7 +11,7 @@
       <code>Xml::removeCharacterDataNodes($actualElement)</code>
       <code>Xml::removeCharacterDataNodes($expectedElement)</code>
     </DeprecatedMethod>
-    <DocblockTypeContradiction occurrences="22">
+    <DocblockTypeContradiction occurrences="16">
       <code>!$actual instanceof Countable &amp;&amp; !is_iterable($actual)</code>
       <code>!$actual instanceof Countable &amp;&amp; !is_iterable($actual)</code>
       <code>!$expected instanceof Countable &amp;&amp; !is_iterable($expected)</code>
@@ -24,12 +24,6 @@
       <code>is_array($array) || $array instanceof ArrayAccess</code>
       <code>is_int($key) || is_string($key)</code>
       <code>is_int($key) || is_string($key)</code>
-      <code>is_iterable($actual)</code>
-      <code>is_iterable($actual)</code>
-      <code>is_iterable($expected)</code>
-      <code>is_iterable($expected)</code>
-      <code>is_iterable($haystack)</code>
-      <code>is_iterable($haystack)</code>
       <code>is_object($object)</code>
       <code>is_object($object)</code>
       <code>is_string($key)</code>