Skip to content

Commit 52d00f3

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '11.5' into 12.3
2 parents 0d401d0 + 17ab800 commit 52d00f3

File tree

8 files changed

+44
-34
lines changed

8 files changed

+44
-34
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.23",
3+
"phpstan/phpstan": "^2.1.24",
44
"phpstan/extension-installer": "^1.4.3",
55
"phpstan/phpstan-strict-rules": "^2.0.6",
66
"tomasvotruba/type-coverage": "^2.0.2",

‎tools/.phpstan/composer.lock‎

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

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,17 +221,17 @@
221221
},
222222
{
223223
"name": "phpstan/phpstan",
224-
"version": "2.1.23",
225-
"version_normalized": "2.1.23.0",
224+
"version": "2.1.24",
225+
"version_normalized": "2.1.24.0",
226226
"source": {
227227
"type": "git",
228228
"url": "https://github.com/phpstan/phpstan.git",
229-
"reference": "a34502adbbd5c2366b5a97679848a5ace4f6f2f5"
229+
"reference": "5a9f28e9ec3fe8b1b7cbd42b3935a66b569f2ff2"
230230
},
231231
"dist": {
232232
"type": "zip",
233-
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/a34502adbbd5c2366b5a97679848a5ace4f6f2f5",
234-
"reference": "a34502adbbd5c2366b5a97679848a5ace4f6f2f5",
233+
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/5a9f28e9ec3fe8b1b7cbd42b3935a66b569f2ff2",
234+
"reference": "5a9f28e9ec3fe8b1b7cbd42b3935a66b569f2ff2",
235235
"shasum": ""
236236
},
237237
"require": {
@@ -240,7 +240,7 @@
240240
"conflict": {
241241
"phpstan/phpstan-shim": "*"
242242
},
243-
"time": "2025-09-10T11:42:22+00:00",
243+
"time": "2025-09-12T07:54:24+00:00",
244244
"bin": [
245245
"phpstan",
246246
"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.3.x-dev',
55
'version' => '12.3.9999999.9999999-dev',
6-
'reference' => '72b3b553bf4d7920b22832d045532000ad0c4c63',
6+
'reference' => '0d401d0df2e3c1703be425ecdc2d04f5c095938d',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -13,7 +13,7 @@
1313
'__root__' => array(
1414
'pretty_version' => '12.3.x-dev',
1515
'version' => '12.3.9999999.9999999-dev',
16-
'reference' => '72b3b553bf4d7920b22832d045532000ad0c4c63',
16+
'reference' => '0d401d0df2e3c1703be425ecdc2d04f5c095938d',
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.23',
51-
'version' => '2.1.23.0',
52-
'reference' => 'a34502adbbd5c2366b5a97679848a5ace4f6f2f5',
50+
'pretty_version' => '2.1.24',
51+
'version' => '2.1.24.0',
52+
'reference' => '5a9f28e9ec3fe8b1b7cbd42b3935a66b569f2ff2',
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' => '/Users/sb/Work/OpenSource/phpunit/tools/.phpstan/vendor/ergebnis/phpstan-rules',
15+
'install_path' => '/usr/local/src/phpunit/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' => '/Users/sb/Work/OpenSource/phpunit/tools/.phpstan/vendor/phpstan/phpstan-strict-rules',
29+
'install_path' => '/usr/local/src/phpunit/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' => '/Users/sb/Work/OpenSource/phpunit/tools/.phpstan/vendor/tomasvotruba/type-coverage',
43+
'install_path' => '/usr/local/src/phpunit/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: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,16 @@ final public static function loadClass(string $class): void {
9292
require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php81/Php81.php';
9393
require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php81/bootstrap.php';
9494
}
95+
96+
if (
97+
PHP_VERSION_ID < 80300
98+
&& empty ($GLOBALS['__composer_autoload_files']['662a729f963d39afe703c9d9b7ab4a8c'])
99+
&& !class_exists(\Symfony\Polyfill\Php83\Php83::class, false)
100+
) {
101+
$GLOBALS['__composer_autoload_files']['662a729f963d39afe703c9d9b7ab4a8c'] = true;
102+
require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php83/Php83.php';
103+
require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php83/bootstrap.php';
104+
}
95105
}
96106

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

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

22.8 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/C5cAFAmjBY/oACgkQUcZzBf/C
4-
5cCNOBAAitJwWS4FvpgTZ1SaBxsuKlu+AT55StiEfWY7NV7L1AuQUR39T/MPAJr1
5-
wzWune3Gx+Hlrwx6x2KPW83Xoi41L8xKz1xV1bBGQjj0k4ERdjdnogl/0sBBjnAz
6-
yn4qPYS4MBxhooK+hC0/2lmUHxi58ja48mRn7cP59LUB+pc4ygGWJxaH03Ukb108
7-
cQGBdek0l2+1frmQZMDPPfYOdCenllNxlo3J+QfIF1+vJNklaHQ42YcgKVsJWtdo
8-
hXRb5JNHs5TcV7phYoZdigtIcNBEwjvBgHU5klTgQgrE10pehwhrMryDw6oc/ckq
9-
GafRJXTR4Px0jdNKSB9Lg7bRCc8umAxk4/K2KFLs15kMEiqglZ+EwYze0LbC9zBc
10-
7uwKkTo4+NwM9pGrCJONQx3Ly9zYnv3Eb8PuRUC4l79gKNAPkr4nrIqNDitS1ky4
11-
C7cM4TJ8qK+S8BZfqm/tfLwLQGlbaHzHeT8JryjE+wPCKKEfIEExdAStWN89jqn7
12-
hRtBjWwHH6O4mOpXgfQD/RDhpWO5eN4YhVrGP6KaUk8E04ZFxz5alT4VZCVFwrO/
13-
t26CRlUNHfdEA59M8uqhj9Y572hX+sDCIBo13V7pvBWfHcjWsh109C3ZC3KC7hz4
14-
7aZL429Ax3S34M0HRmzHnCPHEPdGU/M4Qm5DXtZHH+o6SoqqxTw=
15-
=9Z7b
3+
iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmjD0Y0ACgkQUcZzBf/C
4+
5cCDiA//aBYSoAFVGYJLimR6pm/dbd3Ut2A9zMjyeAJD2bBWwhuT/CpLaQ0fm6Zq
5+
u+G8Tejwl9cZ94d9OyqUgMMXzCoo5+C6iRMOeJERrnHvG3AEZwqil4ePQ2Qh0dD9
6+
RDn3wKzlPUhHDOmNKK2bCzDVaKk915GwakXLpyvMlccYDSoMDivSnvEQ21qqi5cA
7+
/edM2DiqW7F7C6Dj24slLIRC1L6YpPRytKTBjCUNGT74Tck6k78gVoUQ8D/PR+T2
8+
eH721kUbs8Qsglghcmf1rLrylhwq6aKdnLICoRO1uuMGFvtMsCzoMJeRcraeWF/9
9+
kKqC9WARJ7+ia/UFOfFJGs2PuvwAE07Tx02MrqPDarwBnz8lwFvl/kAtEUgg3P7O
10+
Orck4OoXlWgVn4xNl8Lk5DBbYQD1rOKjlTbMBqnzAEI+S8uvmVAwDdGnzmi0NOsk
11+
/2u1ayjh+S+XL3Kb2XM/nl246ciynhBwKuD26Qxb4SFW7HmRsX9oG0btd5vouR2b
12+
9diLqO2Qu6S3br5MXlfzYo9ttsOYslKu+Co0gzdzeik39LS87i/EfH+ROT4mihVr
13+
2bwXzzNWQ3FbI1F62AEbUz5AJoczJdL3/1ADeeGqbO1rgmqD9LByr0wM7LjrQHfP
14+
n0jXBUuPzrWWV3d7o4HoRNGjfi3XDNAKgioPPVPFutBBDXFo6OE=
15+
=KpBt
1616
-----END PGP SIGNATURE-----

0 commit comments

Comments
 (0)