Merge branch '13.1'

* 13.1:
  Fix CS/WS issues
  Update tools

Author: sebastianbergmann

.phive/phars.xml

@@ -1,7 +1,7 @@
 <?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="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/Framework/Constraint/Constraint.php

@@ -287,10 +287,10 @@ protected function valueToTypeStringFragment(mixed $value): string
         }
 
         return match ($type) {
-            'array', 'integer' => 'an ' . $type . ' ',
+            'array', 'integer'                                          => 'an ' . $type . ' ',
             'boolean', 'closed resource', 'float', 'resource', 'string' => 'a ' . $type . ' ',
-            'null'  => 'null ',
-            default => 'a value of ' . $type . ' ',
+            'null'                                                      => 'null ',
+            default                                                     => 'a value of ' . $type . ' ',
         };
     }
 }

src/TextUI/Output/TestDox/ResultPrinter.php

@@ -286,7 +286,7 @@ private function colorizeMessageAndDiff(string $buffer, string $style): array
         $lines = [];
 
         if ($buffer !== '') {
-            $lines = array_map(\rtrim(...), explode(PHP_EOL, $buffer));
+            $lines = array_map(rtrim(...), explode(PHP_EOL, $buffer));
         }
 
         $message    = [];

src/Util/Color.php

@@ -25,6 +25,7 @@
 use function preg_split;
 use function sprintf;
 use function str_pad;
+use function strlen;
 use function strtr;
 use function trim;
 
@@ -124,7 +125,7 @@ public static function colorizeTextBox(string $color, string $buffer, ?int $colu
 
         assert($lines !== false && $lines !== []);
 
-        $maxBoxWidth = max(array_map(\strlen(...), $lines));
+        $maxBoxWidth = max(array_map(strlen(...), $lines));
 
         if ($columns !== null) {
             $maxBoxWidth = min($maxBoxWidth, $columns);

tests/_files/DataProviderDependencyVoidTest.php

@@ -20,8 +20,8 @@ public static function provider(): iterable
         return [
             [0, 0],
             [1, 'b' => 1],
-            ['a' => 2, 'b' => 2],
-            ['b' => 3, 'a' => 3],
+            ['a'    => 2, 'b' => 2],
+            ['b'    => 3, 'a' => 3],
         ];
     }
 

tests/unit/Framework/Assert/assertEqualsTest.php

@@ -197,7 +197,7 @@ public static 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)],

tests/unit/Framework/Assert/assertSameTest.php

@@ -71,8 +71,8 @@ public static 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],

tools/.phpstan/composer.json

@@ -1,6 +1,6 @@
 {
     "require-dev": {
-        "phpstan/phpstan": "^2.1.46",
+        "phpstan/phpstan": "^2.1.47",
         "phpstan/extension-installer": "^1.4.3",
         "phpstan/phpstan-strict-rules": "^2.0.10",
         "tomasvotruba/type-coverage": "^2.1.0",

tools/.phpstan/composer.lock

@@ -223,12 +223,12 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.46",
-            "version_normalized": "2.1.46.0",
+            "version": "2.1.47",
+            "version_normalized": "2.1.47.0",
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a193923fc2d6325ef4e741cf3af8c3e8f54dbf25",
-                "reference": "a193923fc2d6325ef4e741cf3af8c3e8f54dbf25",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/79015445d8bd79e62b29140f12e5bfced1dcca65",
+                "reference": "79015445d8bd79e62b29140f12e5bfced1dcca65",
                 "shasum": ""
             },
             "require": {
@@ -237,7 +237,7 @@
             "conflict": {
                 "phpstan/phpstan-shim": "*"
             },
-            "time": "2026-04-01T09:25:14+00:00",
+            "time": "2026-04-13T15:49:08+00:00",
             "bin": [
                 "phpstan",
                 "phpstan.phar"