Skip to content

Commit 12f0d08

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '11.5' into 12.3
2 parents c97684f + ba5bab3 commit 12f0d08

File tree

9 files changed

+39
-31
lines changed

9 files changed

+39
-31
lines changed

‎.phive/phars.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
33
<phar name="phpab" version="^1.29" installed="1.29.3" location="./tools/phpab" copy="true"/>
4-
<phar name="php-cs-fixer" version="^3.80" installed="3.87.1" location="./tools/php-cs-fixer" copy="true"/>
4+
<phar name="php-cs-fixer" version="^3.80" installed="3.87.2" location="./tools/php-cs-fixer" copy="true"/>
55
<phar name="humbug/php-scoper" version="^0.18" installed="0.18.17" location="./tools/php-scoper" copy="true"/>
66
<phar name="composer" version="^2.8" installed="2.8.11" location="./tools/composer" copy="true"/>
77
</phive>

‎tools/.phpstan/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"phpstan/extension-installer": "^1.4.3",
55
"phpstan/phpstan-strict-rules": "^2.0.6",
66
"tomasvotruba/type-coverage": "^2.0.2",
7-
"ergebnis/phpstan-rules": "^2.11.0"
7+
"ergebnis/phpstan-rules": "^2.12.0"
88
},
99
"config": {
1010
"allow-plugins": {

‎tools/.phpstan/composer.lock‎

Lines changed: 8 additions & 9 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: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"packages": [
33
{
44
"name": "ergebnis/phpstan-rules",
5-
"version": "2.11.0",
6-
"version_normalized": "2.11.0.0",
5+
"version": "2.12.0",
6+
"version_normalized": "2.12.0.0",
77
"source": {
88
"type": "git",
99
"url": "https://github.com/ergebnis/phpstan-rules.git",
10-
"reference": "505fead92d89daeb6aa045e92a3e77b55f4ca6a5"
10+
"reference": "c4e0121a937b3b551f800a86e7d78794da2783ea"
1111
},
1212
"dist": {
1313
"type": "zip",
14-
"url": "https://api.github.com/repos/ergebnis/phpstan-rules/zipball/505fead92d89daeb6aa045e92a3e77b55f4ca6a5",
15-
"reference": "505fead92d89daeb6aa045e92a3e77b55f4ca6a5",
14+
"url": "https://api.github.com/repos/ergebnis/phpstan-rules/zipball/c4e0121a937b3b551f800a86e7d78794da2783ea",
15+
"reference": "c4e0121a937b3b551f800a86e7d78794da2783ea",
1616
"shasum": ""
1717
},
1818
"require": {
@@ -25,10 +25,9 @@
2525
"doctrine/orm": "^2.20.0 || ^3.3.0",
2626
"ergebnis/composer-normalize": "^2.47.0",
2727
"ergebnis/license": "^2.6.0",
28-
"ergebnis/php-cs-fixer-config": "^6.52.0",
29-
"ergebnis/phpunit-slow-test-detector": "^2.19.1",
28+
"ergebnis/php-cs-fixer-config": "^6.54.0",
29+
"ergebnis/phpunit-slow-test-detector": "^2.20.0",
3030
"fakerphp/faker": "^1.24.1",
31-
"nette/di": "^3.1.10",
3231
"phpstan/extension-installer": "^1.4.3",
3332
"phpstan/phpstan-deprecation-rules": "^2.0.3",
3433
"phpstan/phpstan-phpunit": "^2.0.7",
@@ -38,7 +37,7 @@
3837
"symfony/finder": "^5.4.45",
3938
"symfony/process": "^5.4.47"
4039
},
41-
"time": "2025-08-19T07:58:25+00:00",
40+
"time": "2025-09-07T13:31:33+00:00",
4241
"type": "phpstan-extension",
4342
"extra": {
4443
"phpstan": {

‎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' => '709421ed481860d94b3807fff2d50c372257e590',
6+
'reference' => '020397b781c493d09a28ef435ae3cff93f9ac47b',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -13,16 +13,16 @@
1313
'__root__' => array(
1414
'pretty_version' => '12.3.x-dev',
1515
'version' => '12.3.9999999.9999999-dev',
16-
'reference' => '709421ed481860d94b3807fff2d50c372257e590',
16+
'reference' => '020397b781c493d09a28ef435ae3cff93f9ac47b',
1717
'type' => 'library',
1818
'install_path' => __DIR__ . '/../../',
1919
'aliases' => array(),
2020
'dev_requirement' => false,
2121
),
2222
'ergebnis/phpstan-rules' => array(
23-
'pretty_version' => '2.11.0',
24-
'version' => '2.11.0.0',
25-
'reference' => '505fead92d89daeb6aa045e92a3e77b55f4ca6a5',
23+
'pretty_version' => '2.12.0',
24+
'version' => '2.12.0.0',
25+
'reference' => 'c4e0121a937b3b551f800a86e7d78794da2783ea',
2626
'type' => 'phpstan-extension',
2727
'install_path' => __DIR__ . '/../ergebnis/phpstan-rules',
2828
'aliases' => array(),

‎tools/.phpstan/vendor/ergebnis/phpstan-rules/CHANGELOG.md‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## Unreleased
88

9-
For a full diff see [`2.11.0...main`][2.11.0...main].
9+
For a full diff see [`2.12.0...main`][2.12.0...main].
10+
11+
## [`2.12.0`][2.12.0]
12+
13+
For a full diff see [`2.11.0...2.12.0`][2.11.0...2.12.0].
14+
15+
### Added
16+
17+
- Added support for PHP 8.5 ([#977]), by [@localheinz]
1018

1119
## [`2.11.0`][2.11.0]
1220

@@ -579,6 +587,7 @@ For a full diff see [`362c7ea...0.1.0`][362c7ea...0.1.0].
579587
[2.10.4]: https://github.com/ergebnis/phpstan-rules/releases/tag/2.10.4
580588
[2.10.5]: https://github.com/ergebnis/phpstan-rules/releases/tag/2.10.5
581589
[2.11.0]: https://github.com/ergebnis/phpstan-rules/releases/tag/2.11.0
590+
[2.12.0]: https://github.com/ergebnis/phpstan-rules/releases/tag/2.12.0
582591

583592
[362c7ea...0.1.0]: https://github.com/ergebnis/phpstan-rules/compare/362c7ea...0.1.0
584593
[0.1.0...0.2.0]: https://github.com/ergebnis/phpstan-rules/compare/0.1.0...0.2.0
@@ -628,7 +637,8 @@ For a full diff see [`362c7ea...0.1.0`][362c7ea...0.1.0].
628637
[2.10.3...2.10.4]: https://github.com/ergebnis/phpstan-rules/compare/2.10.3...2.10.4
629638
[2.10.4...2.10.5]: https://github.com/ergebnis/phpstan-rules/compare/2.10.4...2.10.5
630639
[2.10.5...2.11.0]: https://github.com/ergebnis/phpstan-rules/compare/2.10.5...2.11.0
631-
[2.11.0...main]: https://github.com/ergebnis/phpstan-rules/compare/2.11.0...main
640+
[2.11.0...2.12.0]: https://github.com/ergebnis/phpstan-rules/compare/2.11.0...2.12.0
641+
[2.12.0...main]: https://github.com/ergebnis/phpstan-rules/compare/2.12.0...main
632642

633643
[#1]: https://github.com/ergebnis/phpstan-rules/pull/1
634644
[#4]: https://github.com/ergebnis/phpstan-rules/pull/4
@@ -725,6 +735,7 @@ For a full diff see [`362c7ea...0.1.0`][362c7ea...0.1.0].
725735
[#957]: https://github.com/ergebnis/phpstan-rules/pull/957
726736
[#958]: https://github.com/ergebnis/phpstan-rules/pull/958
727737
[#972]: https://github.com/ergebnis/phpstan-rules/pull/972
738+
[#977]: https://github.com/ergebnis/phpstan-rules/pull/977
728739

729740
[@cosmastech]: https://github.com/cosmastech
730741
[@enumag]: https://github.com/enumag

‎tools/.phpstan/vendor/ergebnis/phpstan-rules/composer.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@
3030
"doctrine/orm": "^2.20.0 || ^3.3.0",
3131
"ergebnis/composer-normalize": "^2.47.0",
3232
"ergebnis/license": "^2.6.0",
33-
"ergebnis/php-cs-fixer-config": "^6.52.0",
34-
"ergebnis/phpunit-slow-test-detector": "^2.19.1",
33+
"ergebnis/php-cs-fixer-config": "^6.54.0",
34+
"ergebnis/phpunit-slow-test-detector": "^2.20.0",
3535
"fakerphp/faker": "^1.24.1",
36-
"nette/di": "^3.1.10",
3736
"phpstan/extension-installer": "^1.4.3",
3837
"phpstan/phpstan-deprecation-rules": "^2.0.3",
3938
"phpstan/phpstan-phpunit": "^2.0.7",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ final class GeneratedConfig
2121
0 => 'rules.neon',
2222
),
2323
),
24-
'version' => '2.11.0',
24+
'version' => '2.12.0',
2525
'phpstanVersionConstraint' => '>=2.1.8.0-dev, <3.0.0.0-dev',
2626
),
2727
'phpstan/phpstan-strict-rules' =>

‎tools/php-cs-fixer‎

1.05 KB
Binary file not shown.

0 commit comments

Comments
 (0)