Merge branch '8.5' into 9.5

.phive/phars.xml

@@ -4,7 +4,7 @@
   <phar name="php-cs-fixer" version="^3.0" installed="3.0.0" 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.8.1" location="./tools/psalm" copy="true"/>
+  <phar name="psalm" version="^4.0" installed="4.9.1" location="./tools/psalm" copy="true"/>
   <phar name="humbug/php-scoper" version="^0.15.0" installed="0.15.0" location="./tools/php-scoper" copy="true"/>
   <phar name="composer" version="^2.0.3" installed="2.1.5" location="./tools/composer" copy="true"/>
 </phive>

.psalm/baseline.xml

@@ -672,6 +672,12 @@
     <DeprecatedMethod occurrences="1">
       <code>setMethods</code>
     </DeprecatedMethod>
+    <DeprecatedProperty occurrences="4">
+      <code>$this-&gt;backupGlobalsBlacklist</code>
+      <code>$this-&gt;backupGlobalsBlacklist</code>
+      <code>$this-&gt;backupStaticAttributesBlacklist</code>
+      <code>$this-&gt;backupStaticAttributesBlacklist</code>
+    </DeprecatedProperty>
     <DocblockTypeContradiction occurrences="5">
       <code>$this-&gt;backupStaticAttributes === null</code>
       <code>$this-&gt;mockObjectGenerator === null</code>
@@ -759,7 +765,17 @@
       <code>endTest</code>
       <code>startTest</code>
     </DeprecatedMethod>
-    <DeprecatedProperty occurrences="1">
+    <DeprecatedProperty occurrences="11">
+      <code>$this-&gt;listeners</code>
+      <code>$this-&gt;listeners</code>
+      <code>$this-&gt;listeners</code>
+      <code>$this-&gt;listeners</code>
+      <code>$this-&gt;listeners</code>
+      <code>$this-&gt;listeners</code>
+      <code>$this-&gt;listeners</code>
+      <code>$this-&gt;listeners</code>
+      <code>$this-&gt;listeners</code>
+      <code>$this-&gt;listeners</code>
       <code>$this-&gt;listeners</code>
     </DeprecatedProperty>
     <InvalidArgument occurrences="1">
@@ -1233,8 +1249,12 @@
       <code>hasTestSuiteLoaderClass</code>
       <code>hasTestSuiteLoaderFile</code>
     </DeprecatedMethod>
-    <DeprecatedProperty occurrences="2">
+    <DeprecatedProperty occurrences="6">
+      <code>$this-&gt;testSuiteLoaderClass</code>
       <code>$this-&gt;testSuiteLoaderClass</code>
+      <code>$this-&gt;testSuiteLoaderClass</code>
+      <code>$this-&gt;testSuiteLoaderFile</code>
+      <code>$this-&gt;testSuiteLoaderFile</code>
       <code>$this-&gt;testSuiteLoaderFile</code>
     </DeprecatedProperty>
     <MissingParamType occurrences="1">
@@ -1308,9 +1328,6 @@
     <MissingParamType occurrences="1">
       <code>$variable</code>
     </MissingParamType>
-    <PossiblyInvalidIterator occurrences="1">
-      <code>$constants['user']</code>
-    </PossiblyInvalidIterator>
   </file>
   <file src="src/Util/Json.php">
     <MissingParamType occurrences="1">