Merge branch '8.5' into 9.6

Author: sebastianbergmann

.phive/phars.xml

@@ -2,7 +2,7 @@
 <phive xmlns="https://phar.io/phive">
   <phar name="phpab" version="^1.25" installed="1.28.0" location="./tools/phpab" copy="true"/>
   <phar name="php-cs-fixer" version="^3.0" installed="3.22.0" location="./tools/php-cs-fixer" copy="true"/>
-  <phar name="psalm" version="^5.0" installed="5.13.1" location="./tools/psalm" copy="true"/>
+  <phar name="psalm" version="^5.0" installed="5.14.1" location="./tools/psalm" copy="true"/>
   <phar name="humbug/php-scoper" version="^0.18.1" installed="0.18.3" location="./tools/php-scoper" copy="true"/>
   <phar name="composer" version="^2.0.3" installed="2.5.8" location="./tools/composer" copy="true"/>
 </phive>

.psalm/baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.13.1@086b94371304750d1c673315321a55d15fc59015">
+<files psalm-version="5.14.1@b9d355e0829c397b9b3b47d0c0ed042a8a70284d">
   <file src="src/Framework/Assert.php">
     <ArgumentTypeCoercion>
       <code><![CDATA[$actualElement->childNodes->item($i)]]></code>
@@ -453,7 +453,15 @@
       <code>$constraint</code>
     </MissingParamType>
   </file>
+  <file src="src/Framework/Constraint/String/RegularExpression.php">
+    <ArgumentTypeCoercion>
+      <code><![CDATA[$this->pattern]]></code>
+    </ArgumentTypeCoercion>
+  </file>
   <file src="src/Framework/Constraint/String/StringMatchesFormatDescription.php">
+    <ArgumentTypeCoercion>
+      <code>$line</code>
+    </ArgumentTypeCoercion>
     <MissingThrowsDocblock>
       <code><![CDATA[new Differ(new UnifiedDiffOutputBuilder("--- Expected\n+++ Actual\n"))]]></code>
     </MissingThrowsDocblock>
@@ -1090,6 +1098,9 @@
     </MissingTemplateParam>
   </file>
   <file src="src/Runner/Filter/NameFilterIterator.php">
+    <ArgumentTypeCoercion>
+      <code><![CDATA[$this->filter]]></code>
+    </ArgumentTypeCoercion>
     <MissingTemplateParam>
       <code>NameFilterIterator</code>
     </MissingTemplateParam>
@@ -1161,6 +1172,9 @@
       <code>$parameters</code>
       <code>array_merge(self::LONG_OPTIONS, $additionalLongOptions)</code>
     </ArgumentTypeCoercion>
+    <InvalidArgument>
+      <code>$unrecognizedOptions</code>
+    </InvalidArgument>
     <MissingThrowsDocblock>
       <code><![CDATA[throw new Exception(
                 $e->getMessage(),
@@ -1755,6 +1769,11 @@
       <code>$filter</code>
     </ArgumentTypeCoercion>
   </file>
+  <file src="src/Util/RegularExpression.php">
+    <ArgumentTypeCoercion>
+      <code>$pattern</code>
+    </ArgumentTypeCoercion>
+  </file>
   <file src="src/Util/Test.php">
     <MissingReturnType>
       <code>sanitizeVersionNumber</code>
@@ -1818,6 +1837,9 @@
                 $e,
             );]]></code>
     </MissingThrowsDocblock>
+    <PossiblyInvalidArgument>
+      <code>preg_replace($variables, $providedData, $annotation)</code>
+    </PossiblyInvalidArgument>
     <RedundantConditionGivenDocblockType>
       <code>is_string($value)</code>
     </RedundantConditionGivenDocblockType>