Skip to content

Commit 84b19c6

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '11.5' into 12.4
* 11.5: Update tools
2 parents 4f6b37f + af583d4 commit 84b19c6

File tree

9 files changed

+55
-37
lines changed

9 files changed

+55
-37
lines changed

‎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: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@ if (PHP_VERSION_ID < 80000) {
2424
{
2525
private $handle;
2626
private $position;
27-
private $realpath;
2827

2928
public function stream_open($path, $mode, $options, &$opened_path)
3029
{
3130
// get rid of phpvfscomposer:// prefix for __FILE__ & __DIR__ resolution
3231
$opened_path = substr($path, 17);
33-
$this->realpath = realpath($opened_path) ?: $opened_path;
34-
$opened_path = $this->realpath;
35-
$this->handle = fopen($this->realpath, $mode);
32+
$realpath = realpath($opened_path) ?: $opened_path;
33+
$opened_path = $realpath;
34+
$this->handle = fopen($realpath, $mode);
3635
$this->position = 0;
3736

3837
return (bool) $this->handle;

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

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

2928
public function stream_open($path, $mode, $options, &$opened_path)
3029
{
3130
// get rid of phpvfscomposer:// prefix for __FILE__ & __DIR__ resolution
3231
$opened_path = substr($path, 17);
33-
$this->realpath = realpath($opened_path) ?: $opened_path;
34-
$opened_path = $this->realpath;
35-
$this->handle = fopen($this->realpath, $mode);
32+
$realpath = realpath($opened_path) ?: $opened_path;
33+
$opened_path = $realpath;
34+
$this->handle = fopen($realpath, $mode);
3635
$this->position = 0;
3736

3837
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' => '12.4.x-dev',
55
'version' => '12.4.9999999.9999999-dev',
6-
'reference' => 'c91f0a66f72ad30e81862b42ab92659f54522697',
6+
'reference' => '4f6b37ff32a2a61e13ace73a080cd56d237ba45a',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -13,7 +13,7 @@
1313
'__root__' => array(
1414
'pretty_version' => '12.4.x-dev',
1515
'version' => '12.4.9999999.9999999-dev',
16-
'reference' => 'c91f0a66f72ad30e81862b42ab92659f54522697',
16+
'reference' => '4f6b37ff32a2a61e13ace73a080cd56d237ba45a',
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/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);

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

210 KB
Binary file not shown.

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
-----BEGIN PGP SIGNATURE-----
22

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

0 commit comments

Comments
 (0)