Skip to content

Commit f8914c0

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '11.5' into 12.3
2 parents 069ff7a + 9aebb41 commit f8914c0

36 files changed

+155
-92
lines changed

‎.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Install PHP with extensions
2525
uses: shivammathur/setup-php@v2
2626
with:
27-
php-version: 8.3
27+
php-version: 8.4
2828
coverage: none
2929
extensions: none
3030
tools: none

‎build/scripts/extract-release-notes.php

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,27 @@
4444
exit(1);
4545
}
4646

47-
printf(
48-
'%s%s---%s[How to install or update PHPUnit](https://docs.phpunit.de/en/%s/installation.html)%s',
49-
$buffer,
50-
PHP_EOL,
51-
PHP_EOL,
52-
$versionSeries,
53-
PHP_EOL,
47+
print $buffer . PHP_EOL;
48+
49+
$template = <<<'EOT'
50+
51+
---
52+
53+
Learn how to install or update PHPUnit {{versionSeries}} in the [documentation](https://docs.phpunit.de/en/{{versionSeries}}/installation.html).
54+
55+
#### Keep up to date with PHPUnit:
56+
57+
* You can follow [@[email protected]](https://phpc.social/@phpunit) to stay up to date with PHPUnit's development.
58+
* You can subscribe to the [PHPUnit Updates](https://t8cbf4509.emailsys1a.net/275/973/33ad04f4be/subscribe/form.html?_g=1752156344) newsletter to receive updates about and tips for PHPUnit.
59+
60+
EOT;
61+
62+
print str_replace(
63+
[
64+
'{{versionSeries}}',
65+
],
66+
[
67+
$versionSeries,
68+
],
69+
$template,
5470
);

‎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.21",
3+
"phpstan/phpstan": "^2.1.22",
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: 18 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@
99
'TomasVotruba\\TypeCoverage\\' => array($vendorDir . '/tomasvotruba/type-coverage/src'),
1010
'PHPStan\\ExtensionInstaller\\' => array($vendorDir . '/phpstan/extension-installer/src'),
1111
'PHPStan\\' => array($vendorDir . '/phpstan/phpstan-strict-rules/src'),
12+
'Nette\\' => array($vendorDir . '/nette/utils/src'),
1213
'Ergebnis\\PHPStan\\Rules\\' => array($vendorDir . '/ergebnis/phpstan-rules/src'),
1314
);

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ class ComposerStaticInitf9e7218f71d5874b5632927df4f72bd7
2020
'PHPStan\\ExtensionInstaller\\' => 27,
2121
'PHPStan\\' => 8,
2222
),
23+
'N' =>
24+
array (
25+
'Nette\\' => 6,
26+
),
2327
'E' =>
2428
array (
2529
'Ergebnis\\PHPStan\\Rules\\' => 23,
@@ -39,6 +43,10 @@ class ComposerStaticInitf9e7218f71d5874b5632927df4f72bd7
3943
array (
4044
0 => __DIR__ . '/..' . '/phpstan/phpstan-strict-rules/src',
4145
),
46+
'Nette\\' =>
47+
array (
48+
0 => __DIR__ . '/..' . '/nette/utils/src',
49+
),
4250
'Ergebnis\\PHPStan\\Rules\\' =>
4351
array (
4452
0 => __DIR__ . '/..' . '/ergebnis/phpstan-rules/src',

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

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -79,30 +79,30 @@
7979
},
8080
{
8181
"name": "nette/utils",
82-
"version": "v4.0.7",
83-
"version_normalized": "4.0.7.0",
82+
"version": "v4.0.8",
83+
"version_normalized": "4.0.8.0",
8484
"source": {
8585
"type": "git",
8686
"url": "https://github.com/nette/utils.git",
87-
"reference": "e67c4061eb40b9c113b218214e42cb5a0dda28f2"
87+
"reference": "c930ca4e3cf4f17dcfb03037703679d2396d2ede"
8888
},
8989
"dist": {
9090
"type": "zip",
91-
"url": "https://api.github.com/repos/nette/utils/zipball/e67c4061eb40b9c113b218214e42cb5a0dda28f2",
92-
"reference": "e67c4061eb40b9c113b218214e42cb5a0dda28f2",
91+
"url": "https://api.github.com/repos/nette/utils/zipball/c930ca4e3cf4f17dcfb03037703679d2396d2ede",
92+
"reference": "c930ca4e3cf4f17dcfb03037703679d2396d2ede",
9393
"shasum": ""
9494
},
9595
"require": {
96-
"php": "8.0 - 8.4"
96+
"php": "8.0 - 8.5"
9797
},
9898
"conflict": {
9999
"nette/finder": "<3",
100100
"nette/schema": "<1.2.2"
101101
},
102102
"require-dev": {
103-
"jetbrains/phpstorm-attributes": "dev-master",
103+
"jetbrains/phpstorm-attributes": "^1.2",
104104
"nette/tester": "^2.5",
105-
"phpstan/phpstan": "^1.0",
105+
"phpstan/phpstan-nette": "^2.0@stable",
106106
"tracy/tracy": "^2.9"
107107
},
108108
"suggest": {
@@ -113,7 +113,7 @@
113113
"ext-mbstring": "to use Strings::lower() etc...",
114114
"ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()"
115115
},
116-
"time": "2025-06-03T04:55:08+00:00",
116+
"time": "2025-08-06T21:43:34+00:00",
117117
"type": "library",
118118
"extra": {
119119
"branch-alias": {
@@ -122,6 +122,9 @@
122122
},
123123
"installation-source": "dist",
124124
"autoload": {
125+
"psr-4": {
126+
"Nette\\": "src"
127+
},
125128
"classmap": [
126129
"src/"
127130
]
@@ -162,7 +165,7 @@
162165
],
163166
"support": {
164167
"issues": "https://github.com/nette/utils/issues",
165-
"source": "https://github.com/nette/utils/tree/v4.0.7"
168+
"source": "https://github.com/nette/utils/tree/v4.0.8"
166169
},
167170
"install-path": "../nette/utils"
168171
},
@@ -219,17 +222,17 @@
219222
},
220223
{
221224
"name": "phpstan/phpstan",
222-
"version": "2.1.21",
223-
"version_normalized": "2.1.21.0",
225+
"version": "2.1.22",
226+
"version_normalized": "2.1.22.0",
224227
"source": {
225228
"type": "git",
226229
"url": "https://github.com/phpstan/phpstan.git",
227-
"reference": "1ccf445757458c06a04eb3f803603cb118fe5fa6"
230+
"reference": "41600c8379eb5aee63e9413fe9e97273e25d57e4"
228231
},
229232
"dist": {
230233
"type": "zip",
231-
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/1ccf445757458c06a04eb3f803603cb118fe5fa6",
232-
"reference": "1ccf445757458c06a04eb3f803603cb118fe5fa6",
234+
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/41600c8379eb5aee63e9413fe9e97273e25d57e4",
235+
"reference": "41600c8379eb5aee63e9413fe9e97273e25d57e4",
233236
"shasum": ""
234237
},
235238
"require": {
@@ -238,7 +241,7 @@
238241
"conflict": {
239242
"phpstan/phpstan-shim": "*"
240243
},
241-
"time": "2025-07-28T19:35:08+00:00",
244+
"time": "2025-08-04T19:17:37+00:00",
242245
"bin": [
243246
"phpstan",
244247
"phpstan.phar"

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

Lines changed: 8 additions & 8 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' => '264da860d6fe0d00582355a6ecbbf7ae57b44895',
6+
'reference' => '069ff7add6755327fbb222e78c32f81144adfad7',
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' => '264da860d6fe0d00582355a6ecbbf7ae57b44895',
16+
'reference' => '069ff7add6755327fbb222e78c32f81144adfad7',
1717
'type' => 'library',
1818
'install_path' => __DIR__ . '/../../',
1919
'aliases' => array(),
@@ -29,9 +29,9 @@
2929
'dev_requirement' => true,
3030
),
3131
'nette/utils' => array(
32-
'pretty_version' => 'v4.0.7',
33-
'version' => '4.0.7.0',
34-
'reference' => 'e67c4061eb40b9c113b218214e42cb5a0dda28f2',
32+
'pretty_version' => 'v4.0.8',
33+
'version' => '4.0.8.0',
34+
'reference' => 'c930ca4e3cf4f17dcfb03037703679d2396d2ede',
3535
'type' => 'library',
3636
'install_path' => __DIR__ . '/../nette/utils',
3737
'aliases' => array(),
@@ -47,9 +47,9 @@
4747
'dev_requirement' => true,
4848
),
4949
'phpstan/phpstan' => array(
50-
'pretty_version' => '2.1.21',
51-
'version' => '2.1.21.0',
52-
'reference' => '1ccf445757458c06a04eb3f803603cb118fe5fa6',
50+
'pretty_version' => '2.1.22',
51+
'version' => '2.1.22.0',
52+
'reference' => '41600c8379eb5aee63e9413fe9e97273e25d57e4',
5353
'type' => 'library',
5454
'install_path' => __DIR__ . '/../phpstan/phpstan',
5555
'aliases' => array(),

‎tools/.phpstan/vendor/nette/utils/composer.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
}
1616
],
1717
"require": {
18-
"php": "8.0 - 8.4"
18+
"php": "8.0 - 8.5"
1919
},
2020
"require-dev": {
2121
"nette/tester": "^2.5",
2222
"tracy/tracy": "^2.9",
23-
"phpstan/phpstan": "^1.0",
24-
"jetbrains/phpstorm-attributes": "dev-master"
23+
"phpstan/phpstan-nette": "^2.0@stable",
24+
"jetbrains/phpstorm-attributes": "^1.2"
2525
},
2626
"conflict": {
2727
"nette/finder": "<3",
@@ -36,7 +36,10 @@
3636
"ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()"
3737
},
3838
"autoload": {
39-
"classmap": ["src/"]
39+
"classmap": ["src/"],
40+
"psr-4": {
41+
"Nette\\": "src"
42+
}
4043
},
4144
"minimum-stability": "dev",
4245
"scripts": {

‎tools/.phpstan/vendor/nette/utils/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The recommended way to install is via Composer:
4141
composer require nette/utils
4242
```
4343

44-
Nette Utils 4.0 is compatible with PHP 8.0 to 8.4.
44+
Nette Utils 4.0 is compatible with PHP 8.0 to 8.5.
4545

4646
 <!---->
4747

0 commit comments

Comments
 (0)