Fix CS/WS issues

Author: sebastianbergmann

src/Util/Annotation/DocBlock.php

@@ -92,14 +92,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/Printer.php

@@ -43,7 +43,7 @@ class Printer
     protected $autoFlush = false;
 
     /**
-     * @psalm-var resource|closed-resource
+     * @psalm-var closed-resource|resource
      */
     protected $out;
 

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

@@ -2430,8 +2430,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],
@@ -2493,7 +2493,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)],