Merge branch '8.5' into 9.5

.phive/phars.xml

@@ -4,8 +4,8 @@
   <phar name="php-cs-fixer" version="^2.16" installed="2.18.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="^4.0" installed="4.6.1" location="./tools/psalm" copy="true"/>
+  <phar name="psalm" version="^4.0" installed="4.6.2" location="./tools/psalm" copy="true"/>
   <phar name="humbug/php-scoper" version="^0.13.9" installed="0.14.0" 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.10" location="./tools/composer" copy="true"/>
+  <phar name="composer" version="^2.0.3" installed="2.0.11" location="./tools/composer" copy="true"/>
 </phive>

.psalm/baseline.xml

@@ -148,6 +148,10 @@
       <code>static::assertThat($haystack, $constraint, $message)</code>
       <code>static::assertThat($haystack, $constraint, $message)</code>
     </MissingThrowsDocblock>
+    <PossiblyInvalidArgument occurrences="2">
+      <code>$expected</code>
+      <code>$expected</code>
+    </PossiblyInvalidArgument>
     <RedundantCondition occurrences="1">
       <code>assert($step['object'] instanceof TestCase)</code>
     </RedundantCondition>