[pull] main from sebastianbergmann:main

.phive/phars.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="php-cs-fixer" version="^3.86" installed="3.89.2" location="./tools/php-cs-fixer" copy="true"/>
-  <phar name="composer" version="^2.8" installed="2.9.0-RC1" location="./tools/composer" copy="true"/>
+  <phar name="composer" version="^2.8" installed="2.9.1" location="./tools/composer" copy="true"/>
 </phive>

.php-cs-fixer.dist.php

@@ -351,7 +351,7 @@
         ],
         'types_spaces' => true,
         'unary_operator_spaces' => true,
-        'visibility_required' => [
+        'modifier_keywords' => [
             'elements' => [
                 'const',
                 'method',

tools/.phpstan/composer.json

@@ -1,6 +1,6 @@
 {
     "require-dev": {
-        "phpstan/phpstan": "^2.1.31",
+        "phpstan/phpstan": "^2.1.32",
         "phpstan/extension-installer": "^1.4.3",
         "phpstan/phpstan-strict-rules": "^2.0.7",
         "tomasvotruba/type-coverage": "^2.0.2",

tools/.phpstan/vendor/bin/phpstan

@@ -24,14 +24,15 @@ if (PHP_VERSION_ID < 80000) {
         {
             private $handle;
             private $position;
+            private $realpath;
 
             public function stream_open($path, $mode, $options, &$opened_path)
             {
                 // get rid of phpvfscomposer:// prefix for __FILE__ & __DIR__ resolution
                 $opened_path = substr($path, 17);
-                $realpath = realpath($opened_path) ?: $opened_path;
-                $opened_path = $realpath;
-                $this->handle = fopen($realpath, $mode);
+                $this->realpath = realpath($opened_path) ?: $opened_path;
+                $opened_path = $this->realpath;
+                $this->handle = fopen($this->realpath, $mode);
                 $this->position = 0;
 
                 return (bool) $this->handle;

tools/.phpstan/vendor/bin/phpstan.phar

@@ -24,14 +24,15 @@ if (PHP_VERSION_ID < 80000) {
         {
             private $handle;
             private $position;
+            private $realpath;
 
             public function stream_open($path, $mode, $options, &$opened_path)
             {
                 // get rid of phpvfscomposer:// prefix for __FILE__ & __DIR__ resolution
                 $opened_path = substr($path, 17);
-                $realpath = realpath($opened_path) ?: $opened_path;
-                $opened_path = $realpath;
-                $this->handle = fopen($realpath, $mode);
+                $this->realpath = realpath($opened_path) ?: $opened_path;
+                $opened_path = $this->realpath;
+                $this->handle = fopen($this->realpath, $mode);
                 $this->position = 0;
 
                 return (bool) $this->handle;

tools/.phpstan/vendor/composer/installed.json

@@ -221,12 +221,12 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.31",
-            "version_normalized": "2.1.31.0",
+            "version": "2.1.32",
+            "version_normalized": "2.1.32.0",
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ead89849d879fe203ce9292c6ef5e7e76f867b96",
-                "reference": "ead89849d879fe203ce9292c6ef5e7e76f867b96",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e126cad1e30a99b137b8ed75a85a676450ebb227",
+                "reference": "e126cad1e30a99b137b8ed75a85a676450ebb227",
                 "shasum": ""
             },
             "require": {
@@ -235,7 +235,7 @@
             "conflict": {
                 "phpstan/phpstan-shim": "*"
             },
-            "time": "2025-10-10T14:14:11+00:00",
+            "time": "2025-11-11T15:18:17+00:00",
             "bin": [
                 "phpstan",
                 "phpstan.phar"

tools/.phpstan/vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => 'ba70759fec4d74412f9854a5c613a5af3e4032d3',
+        'reference' => '37047b5f0e98b31dccb9b7e7241e4f66ebfcd358',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         '__root__' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => 'ba70759fec4d74412f9854a5c613a5af3e4032d3',
+            'reference' => '37047b5f0e98b31dccb9b7e7241e4f66ebfcd358',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -47,9 +47,9 @@
             'dev_requirement' => true,
         ),
         'phpstan/phpstan' => array(
-            'pretty_version' => '2.1.31',
-            'version' => '2.1.31.0',
-            'reference' => 'ead89849d879fe203ce9292c6ef5e7e76f867b96',
+            'pretty_version' => '2.1.32',
+            'version' => '2.1.32.0',
+            'reference' => 'e126cad1e30a99b137b8ed75a85a676450ebb227',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpstan/phpstan',
             'aliases' => array(),

tools/.phpstan/vendor/phpstan/extension-installer/src/GeneratedConfig.php

@@ -12,7 +12,7 @@ final class GeneratedConfig
 	public const EXTENSIONS = array (
   'ergebnis/phpstan-rules' => 
   array (
-    'install_path' => '/usr/local/src/php-code-coverage/tools/.phpstan/vendor/ergebnis/phpstan-rules',
+    'install_path' => '/Users/sb/Work/OpenSource/php-code-coverage/tools/.phpstan/vendor/ergebnis/phpstan-rules',
     'relative_install_path' => '../../../ergebnis/phpstan-rules',
     'extra' => 
     array (
@@ -26,7 +26,7 @@ final class GeneratedConfig
   ),
   'phpstan/phpstan-strict-rules' => 
   array (
-    'install_path' => '/usr/local/src/php-code-coverage/tools/.phpstan/vendor/phpstan/phpstan-strict-rules',
+    'install_path' => '/Users/sb/Work/OpenSource/php-code-coverage/tools/.phpstan/vendor/phpstan/phpstan-strict-rules',
     'relative_install_path' => '../../phpstan-strict-rules',
     'extra' => 
     array (
@@ -40,7 +40,7 @@ final class GeneratedConfig
   ),
   'tomasvotruba/type-coverage' => 
   array (
-    'install_path' => '/usr/local/src/php-code-coverage/tools/.phpstan/vendor/tomasvotruba/type-coverage',
+    'install_path' => '/Users/sb/Work/OpenSource/php-code-coverage/tools/.phpstan/vendor/tomasvotruba/type-coverage',
     'relative_install_path' => '../../../tomasvotruba/type-coverage',
     'extra' => 
     array (

tools/.phpstan/vendor/phpstan/phpstan/bootstrap.php

@@ -102,6 +102,26 @@ final public static function loadClass(string $class): void {
                 require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php83/Php83.php';
                 require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php83/bootstrap.php';
             }
+
+            if (
+                PHP_VERSION_ID < 80400
+                && empty ($GLOBALS['__composer_autoload_files']['9d2b9fc6db0f153a0a149fefb182415e'])
+                && !class_exists(\Symfony\Polyfill\Php83\Php84::class, false)
+            ) {
+                $GLOBALS['__composer_autoload_files']['9d2b9fc6db0f153a0a149fefb182415e'] = true;
+                require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php84/Php84.php';
+                require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php84/bootstrap.php';
+            }
+
+            if (
+                PHP_VERSION_ID < 80500
+                && empty ($GLOBALS['__composer_autoload_files']['606a39d89246991a373564698c2d8383'])
+                && !class_exists(\Symfony\Polyfill\Php83\Php85::class, false)
+            ) {
+                $GLOBALS['__composer_autoload_files']['606a39d89246991a373564698c2d8383'] = true;
+                require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php85/Php85.php';
+                require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php85/bootstrap.php';
+            }
 		}
 
 		$filename = str_replace('\\', DIRECTORY_SEPARATOR, $class);

tools/.phpstan/vendor/phpstan/phpstan/phpstan.phar.asc

@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmjpFJAACgkQUcZzBf/C
-5cBX9w/+Madphjrc81G2k9OtvthicE1g55EdRCLDTuEyzGeKqYTap72EhoQbTUMQ
-0D41PmY56TIygKhnboV56cWik30rquU4nQi8e+rasc/ABLAG3/z/ZEJiTt0OLQ86
-xe81K4nUI/jHSZQwngGYnW+ex+C8yGspdVDuXyJHMtRgqCT7LBxZoSG+51Q85bZE
-+o2hPut0O1iGli9golrbcUMUzRNcnbm5vV+1tgv3LBqZA0bOZntSTm1qpgVaZ1/V
-hgp0HbTj4WAxYY7kd/MUnD73M1CVqv0/h4xtCnyqU3qlLIyxs/HyUp2igA1eV7Ju
-W7B1NFEfqinf8LLKV7IUO2n63fkesD/yQcBYA6q9h9NVqBqKnTsH6Pg27e6pbkJD
-dUqJbVRjo8T61nmHgItb8CHMBrLmKcPt8T8eTPNOCNAakLEr2bOsuqooM6taSBSI
-wtxOrBgDj4P2+wTlCEBjdUWMnAFpvrhBU/IMfgI06GKUvnIZqCAxe8jyhwZVAXUu
-Ag7nPZhjTPBGLSqPsfJGJ4CnnMit57Art6g3C1r7upOkbmu4TRf9sV2jlLzVIWVa
-xpUwoxGrU77QM6NkcsFbVLn6qXl6zF4WeYeQf0iAPnrJPjOQh3aIpmtonRO/GLwb
-yrl04HzXtr/tid+fhNUV67ocUvRX6CzYL4FWPj16qTTN1PVXrNM=
-=Q/DA
+iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmkTU5cACgkQUcZzBf/C
+5cC1bg/+MAMAfCH1CDfI78Inqo/Mqa5q40QOn4RmVNex+xb8lKZ1AApc76nwNfn/
+BLI+War1G/5C2WWNgiqI9X7j/jo46oi+oO/1qywssqEn+7S9Ob7C56N2ERoikS3c
+MsrseR5XEVMFRG/enk1Gsmde9PesuIiN10FnsFyhZiMDNUXhoiLHPrERzTlUocAv
+K7/zm4gF152HM8tUir38i+h9BxadfNvah0zWCfzn7v+5OxSAHjz/DriWWdZkIsmB
+VuyZUg1QX05JzRkVBAdEy3h1N9c57ktWVf92PDrNha3hhQ1lw0OvH9+1+B5+Me5w
+BTUrLz+S6PGpFKkLY8M5ucQAvqHB41zgYp1QIN/Da1ZxvsQyAFq6yvD+d+yYG/zn
+k1NVNDrQMAE6GV7YjCK1bDSKExaFyYXmTb93fRN90cxYi3pfZpIMaaiKNGLYFPsk
+YHe1N4/et3741Y8VNSb2S1iu3KVTOzSnEsQL/olD5Trt6faKtscCSY7deeINoMkq
+IGLQmZjbj4TUO0js2Lw8zTp/d8X3bd67ktdVmijjaKurNYXJsecYuAZXz3WOTek9
+aXuT8kC1aZz/h7CxvjaN2G3KAi5yZ2aN57CSUYhDpmeN2VhvDGaGgHBPFSHcE5fx
+dr4BzRNTOU1ACBONChMGSvuDKCqC7kzt+qvWY29TlZxgwO+iIq8=
+=0Qu+
 -----END PGP SIGNATURE-----