Merge branch '8.5' into 9.6

.phive/phars.xml

@@ -2,7 +2,7 @@
 <phive xmlns="https://phar.io/phive">
  <phar name="phpab" version="^1.25" installed="1.27.2" location="./tools/phpab" copy="true"/>
  <phar name="php-cs-fixer" version="^3.0" installed="3.15.1" location="./tools/php-cs-fixer" copy="true"/>
- <phar name="psalm" version="^5.0" installed="5.8.0" location="./tools/psalm" copy="true"/>
+ <phar name="psalm" version="^5.0" installed="5.9.0" 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.5" location="./tools/composer" copy="true"/>
 </phive>

.psalm/baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.8.0@9cf4f60a333f779ad3bc704a555920e81d4fdcda">
+<files psalm-version="5.9.0@8b9ad1eb9e8b7d3101f949291da2b9f7767cd163">
  <file src="src/Framework/Assert.php">
  <ArgumentTypeCoercion>
  <code><![CDATA[$actualElement->childNodes->item($i)]]></code>
@@ -1570,10 +1570,27 @@
  </PropertyNotSetInConstructor>
  </file>
  <file src="src/Util/Annotation/DocBlock.php">
- <MissingThrowsDocblock>
- <code>throw new SkippedTestError;</code>
- </MissingThrowsDocblock>
- <MoreSpecificReturnType>
+ <InvalidPropertyAssignmentValue>
+ <code><![CDATA[array_merge(
+ $requires,
+ ['__OFFSET' => $recordedOffsets],
+ array_filter([
+ 'setting' => $recordedSettings,
+ 'extension_versions' => $extensionVersions,
+ ])
+ )]]></code>
+ </InvalidPropertyAssignmentValue>
+ <InvalidReturnStatement>
+ <code><![CDATA[$this->parsedRequirements = array_merge(
+ $requires,
+ ['__OFFSET' => $recordedOffsets],
+ array_filter([
+ 'setting' => $recordedSettings,
+ 'extension_versions' => $extensionVersions,
+ ])
+ )]]></code>
+ </InvalidReturnStatement>
+ <InvalidReturnType>
  <code><![CDATA[array{
  * __OFFSET: array<string, int>&array{__FILE: string},
  * setting?: array<string, string>,
@@ -1582,7 +1599,10 @@
  * string,
  * string|array{version: string, operator: string}|array{constraint: string}|array<int|string, string>
  * >]]></code>
- </MoreSpecificReturnType>
+ </InvalidReturnType>
+ <MissingThrowsDocblock>
+ <code>throw new SkippedTestError;</code>
+ </MissingThrowsDocblock>
  <RedundantCast>
  <code><![CDATA[(string) $matches['value'][$i]]]></code>
  </RedundantCast>