Merge branch '8.5' into 9.6

* 8.5:
  Fix CS/WS issues
  Update tools

Author: sebastianbergmann

.phive/phars.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="phpab" version="^1.29" installed="1.29.4" location="./tools/phpab" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.94" installed="3.94.2" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.94" installed="3.95.1" location="./tools/php-cs-fixer" copy="true"/>
   <phar name="psalm" version="^5.26" installed="5.26.1" location="./tools/psalm" copy="true"/>
   <phar name="humbug/php-scoper" version="^0.18" installed="0.18.19" location="./tools/php-scoper" copy="true"/>
-  <phar name="composer" version="^2.8" installed="2.9.5" location="./tools/composer" copy="true"/>
+  <phar name="composer" version="^2.8" installed="2.10.0-RC1" location="./tools/composer" copy="true"/>
 </phive>

src/Util/Annotation/DocBlock.php

@@ -86,14 +86,14 @@ final class DocBlock
     /**
      * @var null|array<string, mixed>
      *
-     * @psalm-var null|(array{
+     * @psalm-var null|(array<
+     *   string,
+     *   array<int|string, string>|array{constraint: string}|array{version: string, operator: string}|string
+     * >&array{
      *   __OFFSET: array<string, int>&array{__FILE: string},
      *   setting?: array<string, string>,
      *   extension_versions?: array<string, array{version: string, operator: string}>
-     * }&array<
-     *   string,
-     *   string|array{version: string, operator: string}|array{constraint: string}|array<int|string, string>
-     * >)
+     * })
      */
     private $parsedRequirements;
 

src/Util/VersionComparisonOperator.php

@@ -20,7 +20,7 @@
 final class VersionComparisonOperator
 {
     /**
-     * @psalm-var '<'|'lt'|'<='|'le'|'>'|'gt'|'>='|'ge'|'=='|'='|'eq'|'!='|'<>'|'ne'
+     * @psalm-var '!='|'<'|'<='|'<>'|'='|'=='|'>'|'>='|'eq'|'ge'|'gt'|'le'|'lt'|'ne'
      */
     private $operator;
 

tests/unit/Framework/AssertTest.php

@@ -2180,8 +2180,8 @@ protected function sameValues(): array
             [-INF, -INF],
             // arrays
             [[], []],
-            [[0 => 1], [0 => 1]],
-            [[0 => null], [0 => null]],
+            [[0 => 1], [0                    => 1]],
+            [[0 => null], [0                 => null]],
             [['a', 'b' => [1, 2]], ['a', 'b' => [1, 2]]],
             // objects
             [$object, $object],
@@ -2243,7 +2243,7 @@ protected function notEqualValues(): array
             [[], [0 => 1]],
             [[0 => 1], []],
             [[0 => null], []],
-            [[0 => 1, 1 => 2], [0 => 1, 1 => 3]],
+            [[0 => 1, 1 => 2], [0            => 1, 1 => 3]],
             [['a', 'b' => [1, 2]], ['a', 'b' => [2, 1]]],
             // objects
             [new SampleClass(4, 8, 15), new SampleClass(16, 23, 42)],