Skip to content

Commit 9a5ff2a

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '11.0'
* 11.0: Update PHP-CS-Fixer configuration Update tools
2 parents 37047b5 + 59e6ffa commit 9a5ff2a

File tree

13 files changed

+62
-40
lines changed

13 files changed

+62
-40
lines changed

‎.phive/phars.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
33
<phar name="php-cs-fixer" version="^3.86" installed="3.89.2" location="./tools/php-cs-fixer" copy="true"/>
4-
<phar name="composer" version="^2.8" installed="2.9.0-RC1" location="./tools/composer" copy="true"/>
4+
<phar name="composer" version="^2.8" installed="2.9.1" location="./tools/composer" copy="true"/>
55
</phive>

‎.php-cs-fixer.dist.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@
351351
],
352352
'types_spaces' => true,
353353
'unary_operator_spaces' => true,
354-
'visibility_required' => [
354+
'modifier_keywords' => [
355355
'elements' => [
356356
'const',
357357
'method',

‎tools/.phpstan/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require-dev": {
3-
"phpstan/phpstan": "^2.1.31",
3+
"phpstan/phpstan": "^2.1.32",
44
"phpstan/extension-installer": "^1.4.3",
55
"phpstan/phpstan-strict-rules": "^2.0.7",
66
"tomasvotruba/type-coverage": "^2.0.2",

‎tools/.phpstan/composer.lock‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/.phpstan/vendor/bin/phpstan‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ if (PHP_VERSION_ID < 80000) {
2424
{
2525
private $handle;
2626
private $position;
27+
private $realpath;
2728

2829
public function stream_open($path, $mode, $options, &$opened_path)
2930
{
3031
// get rid of phpvfscomposer:// prefix for __FILE__ & __DIR__ resolution
3132
$opened_path = substr($path, 17);
32-
$realpath = realpath($opened_path) ?: $opened_path;
33-
$opened_path = $realpath;
34-
$this->handle = fopen($realpath, $mode);
33+
$this->realpath = realpath($opened_path) ?: $opened_path;
34+
$opened_path = $this->realpath;
35+
$this->handle = fopen($this->realpath, $mode);
3536
$this->position = 0;
3637

3738
return (bool) $this->handle;

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ if (PHP_VERSION_ID < 80000) {
2424
{
2525
private $handle;
2626
private $position;
27+
private $realpath;
2728

2829
public function stream_open($path, $mode, $options, &$opened_path)
2930
{
3031
// get rid of phpvfscomposer:// prefix for __FILE__ & __DIR__ resolution
3132
$opened_path = substr($path, 17);
32-
$realpath = realpath($opened_path) ?: $opened_path;
33-
$opened_path = $realpath;
34-
$this->handle = fopen($realpath, $mode);
33+
$this->realpath = realpath($opened_path) ?: $opened_path;
34+
$opened_path = $this->realpath;
35+
$this->handle = fopen($this->realpath, $mode);
3536
$this->position = 0;
3637

3738
return (bool) $this->handle;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,12 @@
221221
},
222222
{
223223
"name": "phpstan/phpstan",
224-
"version": "2.1.31",
225-
"version_normalized": "2.1.31.0",
224+
"version": "2.1.32",
225+
"version_normalized": "2.1.32.0",
226226
"dist": {
227227
"type": "zip",
228-
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/ead89849d879fe203ce9292c6ef5e7e76f867b96",
229-
"reference": "ead89849d879fe203ce9292c6ef5e7e76f867b96",
228+
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/e126cad1e30a99b137b8ed75a85a676450ebb227",
229+
"reference": "e126cad1e30a99b137b8ed75a85a676450ebb227",
230230
"shasum": ""
231231
},
232232
"require": {
@@ -235,7 +235,7 @@
235235
"conflict": {
236236
"phpstan/phpstan-shim": "*"
237237
},
238-
"time": "2025-10-10T14:14:11+00:00",
238+
"time": "2025-11-11T15:18:17+00:00",
239239
"bin": [
240240
"phpstan",
241241
"phpstan.phar"

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'name' => '__root__',
44
'pretty_version' => 'dev-main',
55
'version' => 'dev-main',
6-
'reference' => 'ba70759fec4d74412f9854a5c613a5af3e4032d3',
6+
'reference' => '37047b5f0e98b31dccb9b7e7241e4f66ebfcd358',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -13,7 +13,7 @@
1313
'__root__' => array(
1414
'pretty_version' => 'dev-main',
1515
'version' => 'dev-main',
16-
'reference' => 'ba70759fec4d74412f9854a5c613a5af3e4032d3',
16+
'reference' => '37047b5f0e98b31dccb9b7e7241e4f66ebfcd358',
1717
'type' => 'library',
1818
'install_path' => __DIR__ . '/../../',
1919
'aliases' => array(),
@@ -47,9 +47,9 @@
4747
'dev_requirement' => true,
4848
),
4949
'phpstan/phpstan' => array(
50-
'pretty_version' => '2.1.31',
51-
'version' => '2.1.31.0',
52-
'reference' => 'ead89849d879fe203ce9292c6ef5e7e76f867b96',
50+
'pretty_version' => '2.1.32',
51+
'version' => '2.1.32.0',
52+
'reference' => 'e126cad1e30a99b137b8ed75a85a676450ebb227',
5353
'type' => 'library',
5454
'install_path' => __DIR__ . '/../phpstan/phpstan',
5555
'aliases' => array(),

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ final class GeneratedConfig
1212
public const EXTENSIONS = array (
1313
'ergebnis/phpstan-rules' =>
1414
array (
15-
'install_path' => '/usr/local/src/php-code-coverage/tools/.phpstan/vendor/ergebnis/phpstan-rules',
15+
'install_path' => '/Users/sb/Work/OpenSource/php-code-coverage/tools/.phpstan/vendor/ergebnis/phpstan-rules',
1616
'relative_install_path' => '../../../ergebnis/phpstan-rules',
1717
'extra' =>
1818
array (
@@ -26,7 +26,7 @@ final class GeneratedConfig
2626
),
2727
'phpstan/phpstan-strict-rules' =>
2828
array (
29-
'install_path' => '/usr/local/src/php-code-coverage/tools/.phpstan/vendor/phpstan/phpstan-strict-rules',
29+
'install_path' => '/Users/sb/Work/OpenSource/php-code-coverage/tools/.phpstan/vendor/phpstan/phpstan-strict-rules',
3030
'relative_install_path' => '../../phpstan-strict-rules',
3131
'extra' =>
3232
array (
@@ -40,7 +40,7 @@ final class GeneratedConfig
4040
),
4141
'tomasvotruba/type-coverage' =>
4242
array (
43-
'install_path' => '/usr/local/src/php-code-coverage/tools/.phpstan/vendor/tomasvotruba/type-coverage',
43+
'install_path' => '/Users/sb/Work/OpenSource/php-code-coverage/tools/.phpstan/vendor/tomasvotruba/type-coverage',
4444
'relative_install_path' => '../../../tomasvotruba/type-coverage',
4545
'extra' =>
4646
array (

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,26 @@ final public static function loadClass(string $class): void {
102102
require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php83/Php83.php';
103103
require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php83/bootstrap.php';
104104
}
105+
106+
if (
107+
PHP_VERSION_ID < 80400
108+
&& empty ($GLOBALS['__composer_autoload_files']['9d2b9fc6db0f153a0a149fefb182415e'])
109+
&& !class_exists(\Symfony\Polyfill\Php83\Php84::class, false)
110+
) {
111+
$GLOBALS['__composer_autoload_files']['9d2b9fc6db0f153a0a149fefb182415e'] = true;
112+
require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php84/Php84.php';
113+
require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php84/bootstrap.php';
114+
}
115+
116+
if (
117+
PHP_VERSION_ID < 80500
118+
&& empty ($GLOBALS['__composer_autoload_files']['606a39d89246991a373564698c2d8383'])
119+
&& !class_exists(\Symfony\Polyfill\Php83\Php85::class, false)
120+
) {
121+
$GLOBALS['__composer_autoload_files']['606a39d89246991a373564698c2d8383'] = true;
122+
require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php85/Php85.php';
123+
require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php85/bootstrap.php';
124+
}
105125
}
106126

107127
$filename = str_replace('\\', DIRECTORY_SEPARATOR, $class);

0 commit comments

Comments
 (0)