Skip to content

Commit 1314136

Browse files
Merge branch '11.5' into 12.1
2 parents 952d77e + b5081c4 commit 1314136

File tree

7 files changed

+34
-34
lines changed

7 files changed

+34
-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.13",
3+
"phpstan/phpstan": "^2.1.14",
44
"phpstan/extension-installer": "^1.4.3",
55
"phpstan/phpstan-strict-rules": "^2.0.4",
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
@@ -217,17 +217,17 @@
217217
},
218218
{
219219
"name": "phpstan/phpstan",
220-
"version": "2.1.13",
221-
"version_normalized": "2.1.13.0",
220+
"version": "2.1.14",
221+
"version_normalized": "2.1.14.0",
222222
"source": {
223223
"type": "git",
224224
"url": "https://github.com/phpstan/phpstan.git",
225-
"reference": "e55e03e6d4ac49cd1240907e5b08e5cd378572a9"
225+
"reference": "8f2e03099cac24ff3b379864d171c5acbfc6b9a2"
226226
},
227227
"dist": {
228228
"type": "zip",
229-
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/e55e03e6d4ac49cd1240907e5b08e5cd378572a9",
230-
"reference": "e55e03e6d4ac49cd1240907e5b08e5cd378572a9",
229+
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/8f2e03099cac24ff3b379864d171c5acbfc6b9a2",
230+
"reference": "8f2e03099cac24ff3b379864d171c5acbfc6b9a2",
231231
"shasum": ""
232232
},
233233
"require": {
@@ -236,7 +236,7 @@
236236
"conflict": {
237237
"phpstan/phpstan-shim": "*"
238238
},
239-
"time": "2025-04-27T12:28:25+00:00",
239+
"time": "2025-05-02T15:32:28+00:00",
240240
"bin": [
241241
"phpstan",
242242
"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.1.x-dev',
55
'version' => '12.1.9999999.9999999-dev',
6-
'reference' => '51623311578dfefda45b1cf37eb9785a4b7b0534',
6+
'reference' => '952d77e4b1c8709a14889eae9094bdd5a7d6cc77',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -13,7 +13,7 @@
1313
'__root__' => array(
1414
'pretty_version' => '12.1.x-dev',
1515
'version' => '12.1.9999999.9999999-dev',
16-
'reference' => '51623311578dfefda45b1cf37eb9785a4b7b0534',
16+
'reference' => '952d77e4b1c8709a14889eae9094bdd5a7d6cc77',
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.13',
51-
'version' => '2.1.13.0',
52-
'reference' => 'e55e03e6d4ac49cd1240907e5b08e5cd378572a9',
50+
'pretty_version' => '2.1.14',
51+
'version' => '2.1.14.0',
52+
'reference' => '8f2e03099cac24ff3b379864d171c5acbfc6b9a2',
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/phpunit/tools/.phpstan/vendor/ergebnis/phpstan-rules',
15+
'install_path' => '/Users/sb/Work/OpenSource/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' => '/usr/local/src/phpunit/tools/.phpstan/vendor/phpstan/phpstan-strict-rules',
29+
'install_path' => '/Users/sb/Work/OpenSource/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' => '/usr/local/src/phpunit/tools/.phpstan/vendor/tomasvotruba/type-coverage',
43+
'install_path' => '/Users/sb/Work/OpenSource/phpunit/tools/.phpstan/vendor/tomasvotruba/type-coverage',
4444
'relative_install_path' => '../../../tomasvotruba/type-coverage',
4545
'extra' =>
4646
array (
Binary file not shown.
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/C5cAFAmgOIscACgkQUcZzBf/C
4-
5cBGzA//Wya23VZ7JBZM3RNR4g4d3ez39/BIa5XBHAF1Hpm9dmliDlME6R73ZNHk
5-
D7LT/tLU72AgYuWaIp0mADIkmqU+OPZTGKXkncJHxWlcJm5QLZxy6tYvC8MUvjHK
6-
lv2Vs1Ito9rbnnTHTieAnjvp7Ne3YUmVMLTHPP+R8tyPcNeHbHpUqlQf83sb6OK7
7-
7fZKBeHvb98p1ii9uNetzjC/CWbknHddq9viT46TZYuwXMVKYOuMkweppMHlxOY0
8-
741+FQQ3dJB7Jp3NOLwYYqe7WcMyKrYiXJuIvpUSK38EbHg6NTDqwvenXTDMN45i
9-
x8vhc5mhJHkuNfjqgjgpvvqFMt1WtoYa3a26ArwVcEKfptAkgGsNxvs4TS5xx9xC
10-
fFzyOhMEPbHRSe7DnctOKSR075ylrd+jBfSH7ldoHE5L2H+qSsZIxHZ/cgqmCwVn
11-
eGEetLf5raNyojipMXzJYO3JQtTRkUJ1V9FPK603CNEEXJGW6ZFSSFgsF+PCvWg4
12-
Op5w3OlxpjLRYgtzSSrLZlABNoNbG680+nf7YKaBRbuF4K0IaSBC9Og+KKtCf3MH
13-
hQrVEPJH9M7jvt3Vc8l5KRqALi3AgN0qAXzQWd8X4xUfS9oKEyZjnrfdvmwqk3gg
14-
gZW5hZsGpwY0mgtBV1lRnhv4tLWzhMee3VHZVtVmalz/K0HXdQ0=
15-
=s49h
3+
iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmgU5VIACgkQUcZzBf/C
4+
5cC/gRAAizgBm0jcgTEiN9UBYX3hY0ltG9lRRJ/w1rglazmag2cdsseoHxbeTjX6
5+
M9miQ16ZeV1RzJytgrRVTT8kBx1PpRXMQ/8UlFVd3C0onhIdFY+eGmPuD8ABgl0u
6+
dfCm/BRnmYSti7Q2hInyfUjFNc87RfFb12B14Oh4Rbqau2sCwCWv/OQTgsByBBVJ
7+
GJKs2iF/R8jDYneBodP23vAv5P2FxdhHlfs2B0n6gSed7VWfEXJSfFYYc3vNhgRm
8+
BBt8OY+VZRkWasanOfBFQTI29LUGE/XpmBiUinhLC2uFv7FfMGZpdqDVJNXX0oDj
9+
DQ4EQ2Lg+7IkplU0Kgqlu7G9tvMWOXxcyGzYpixp7uZT2nX/QFRpkk7DTuoGgpsU
10+
MawjRW3m9K0AnQLlA2FGBglogER8gsiE9tg/SUta4XqH/h+zYwsJboJ3FNHEJaq/
11+
5ivSZtlcVDffX1V7nLiUwcmPXnllCcO6MpdCX+7+oEn5uEFDYUW0YmIddQSe33xP
12+
iTSCMZ1WP2+SNfS6xdTl8BgY54iSxg3Qf+5Pc90GXPQusHLoNwyB2oI/Bln3jxBX
13+
nIELI/JB9ljq2gR89ViK6DeqWG+lI43J24AMiI7LjJcx6qrhOQ6/JBqf1marIXoU
14+
0K9kTI1MdWUymZxU+NA4ZL6xQvgloGJDIvpfqnpcBmS9bd/JDRo=
15+
=Ad1L
1616
-----END PGP SIGNATURE-----

0 commit comments

Comments
 (0)