Merge branch '8.5' into 9.5

.phive/phars.xml

@@ -4,7 +4,7 @@
   <phar name="php-cs-fixer" version="^2.16" installed="2.17.3" 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.3.1" location="./tools/psalm" copy="true"/>
+  <phar name="psalm" version="^4.0" installed="4.4.0" 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.8" location="./tools/composer" copy="true"/>

.psalm/baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.3.1@2feba22a005a18bf31d4c7b9bdb9252c73897476">
+<files psalm-version="4.x-dev@">
   <file src="src/Framework/Assert.php">
     <ArgumentTypeCoercion occurrences="2">
       <code>$actualElement-&gt;childNodes-&gt;item($i)</code>
@@ -436,6 +436,12 @@
       <code>id</code>
     </MissingReturnType>
   </file>
+  <file src="src/Framework/MockObject/Builder/InvocationMocker.php">
+    <MissingParamType occurrences="2">
+      <code>$id</code>
+      <code>$id</code>
+    </MissingParamType>
+  </file>
   <file src="src/Framework/MockObject/Builder/InvocationStubber.php">
     <MissingParamType occurrences="2">
       <code>$nextValues</code>

ChangeLog-8.5.md

@@ -8,6 +8,7 @@ All notable changes of the PHPUnit 8.5 release series are documented in this fil
 
 * [#4535](https://github.com/sebastianbergmann/phpunit/issues/4535): `getMockFromWsdl()` does not handle methods that do not have parameters correctly
 * [#4572](https://github.com/sebastianbergmann/phpunit/issues/4572): Schema validation does not work with `%xx` sequences in path to `phpunit.xsd`
+* [#4575](https://github.com/sebastianbergmann/phpunit/issues/4575): PHPUnit 8.5 incompatibility with PHP 8.1
 
 ## [8.5.13] - 2020-12-01