Skip to content

Commit ad08db5

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '11.0'
2 parents 530bb5d + 74e0adf commit ad08db5

36 files changed

+1533
-179
lines changed

‎.phive/phars.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
3-
<phar name="php-cs-fixer" version="^3.70" installed="3.75.0" ___location="./tools/php-cs-fixer" copy="true"/>
4-
<phar name="composer" version="^2.8" installed="2.8.8" ___location="./tools/composer" copy="true"/>
3+
<phar name="php-cs-fixer" version="^3.70" installed="3.84.0" ___location="./tools/php-cs-fixer" copy="true"/>
4+
<phar name="composer" version="^2.8" installed="2.8.10" ___location="./tools/composer" copy="true"/>
55
</phive>

‎.php-cs-fixer.dist.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,16 @@
1717

1818
$config = new PhpCsFixer\Config;
1919
$config->setFinder($finder)
20+
->setUnsupportedPhpVersionAllowed(true)
2021
->setRiskyAllowed(true)
2122
->setRules([
2223
'align_multiline_comment' => true,
2324
'array_indentation' => true,
2425
'array_push' => true,
2526
'array_syntax' => ['syntax' => 'short'],
27+
'attribute_empty_parentheses' => [
28+
'use_parentheses' => false,
29+
],
2630
'backtick_to_shell_exec' => true,
2731
'binary_operator_spaces' => [
2832
'operators' => [

‎tools/.phpstan/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"require-dev": {
3-
"phpstan/phpstan": "^2.1.13",
3+
"phpstan/phpstan": "^2.1.21",
44
"phpstan/extension-installer": "^1.4.3",
5-
"phpstan/phpstan-strict-rules": "^2.0.4",
5+
"phpstan/phpstan-strict-rules": "^2.0.6",
66
"tomasvotruba/type-coverage": "^2.0.2",
7-
"ergebnis/phpstan-rules": "^2.8.0"
7+
"ergebnis/phpstan-rules": "^2.10.5"
88
},
99
"config": {
1010
"allow-plugins": {

‎tools/.phpstan/composer.lock

Lines changed: 32 additions & 30 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: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,43 @@
22
"packages": [
33
{
44
"name": "ergebnis/phpstan-rules",
5-
"version": "2.8.0",
6-
"version_normalized": "2.8.0.0",
5+
"version": "2.10.5",
6+
"version_normalized": "2.10.5.0",
77
"source": {
88
"type": "git",
99
"url": "https://github.com/ergebnis/phpstan-rules.git",
10-
"reference": "30e790621fbad05573ef9cd355279fff5122e080"
10+
"reference": "719a53e793e2417da46d497f21fb8d2f007ecb78"
1111
},
1212
"dist": {
1313
"type": "zip",
14-
"url": "https://api.github.com/repos/ergebnis/phpstan-rules/zipball/30e790621fbad05573ef9cd355279fff5122e080",
15-
"reference": "30e790621fbad05573ef9cd355279fff5122e080",
14+
"url": "https://api.github.com/repos/ergebnis/phpstan-rules/zipball/719a53e793e2417da46d497f21fb8d2f007ecb78",
15+
"reference": "719a53e793e2417da46d497f21fb8d2f007ecb78",
1616
"shasum": ""
1717
},
1818
"require": {
1919
"ext-mbstring": "*",
2020
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
21-
"phpstan/phpstan": "^2.0.0"
21+
"phpstan/phpstan": "^2.1.8"
2222
},
2323
"require-dev": {
24+
"codeception/codeception": "^4.0.0 || ^5.0.0",
2425
"doctrine/orm": "^2.20.0 || ^3.3.0",
25-
"ergebnis/composer-normalize": "^2.45.0",
26+
"ergebnis/composer-normalize": "^2.47.0",
2627
"ergebnis/license": "^2.6.0",
27-
"ergebnis/php-cs-fixer-config": "^6.43.0",
28-
"ergebnis/phpunit-slow-test-detector": "^2.18.0",
28+
"ergebnis/php-cs-fixer-config": "^6.46.0",
29+
"ergebnis/phpunit-slow-test-detector": "^2.19.1",
30+
"fakerphp/faker": "^1.24.1",
2931
"nette/di": "^3.1.10",
3032
"phpstan/extension-installer": "^1.4.3",
31-
"phpstan/phpstan-deprecation-rules": "^2.0.1",
32-
"phpstan/phpstan-phpunit": "^2.0.4",
33-
"phpstan/phpstan-strict-rules": "^2.0.3",
33+
"phpstan/phpstan-deprecation-rules": "^2.0.3",
34+
"phpstan/phpstan-phpunit": "^2.0.6",
35+
"phpstan/phpstan-strict-rules": "^2.0.4",
3436
"phpunit/phpunit": "^9.6.21",
3537
"psr/container": "^2.0.2",
3638
"symfony/finder": "^5.4.45",
3739
"symfony/process": "^5.4.47"
3840
},
39-
"time": "2025-02-18T11:20:05+00:00",
41+
"time": "2025-06-23T17:35:58+00:00",
4042
"type": "phpstan-extension",
4143
"extra": {
4244
"phpstan": {
@@ -77,17 +79,17 @@
7779
},
7880
{
7981
"name": "nette/utils",
80-
"version": "v4.0.6",
81-
"version_normalized": "4.0.6.0",
82+
"version": "v4.0.7",
83+
"version_normalized": "4.0.7.0",
8284
"source": {
8385
"type": "git",
8486
"url": "https://github.com/nette/utils.git",
85-
"reference": "ce708655043c7050eb050df361c5e313cf708309"
87+
"reference": "e67c4061eb40b9c113b218214e42cb5a0dda28f2"
8688
},
8789
"dist": {
8890
"type": "zip",
89-
"url": "https://api.github.com/repos/nette/utils/zipball/ce708655043c7050eb050df361c5e313cf708309",
90-
"reference": "ce708655043c7050eb050df361c5e313cf708309",
91+
"url": "https://api.github.com/repos/nette/utils/zipball/e67c4061eb40b9c113b218214e42cb5a0dda28f2",
92+
"reference": "e67c4061eb40b9c113b218214e42cb5a0dda28f2",
9193
"shasum": ""
9294
},
9395
"require": {
@@ -111,7 +113,7 @@
111113
"ext-mbstring": "to use Strings::lower() etc...",
112114
"ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()"
113115
},
114-
"time": "2025-03-30T21:06:30+00:00",
116+
"time": "2025-06-03T04:55:08+00:00",
115117
"type": "library",
116118
"extra": {
117119
"branch-alias": {
@@ -160,7 +162,7 @@
160162
],
161163
"support": {
162164
"issues": "https://github.com/nette/utils/issues",
163-
"source": "https://github.com/nette/utils/tree/v4.0.6"
165+
"source": "https://github.com/nette/utils/tree/v4.0.7"
164166
},
165167
"install-path": "../nette/utils"
166168
},
@@ -217,17 +219,17 @@
217219
},
218220
{
219221
"name": "phpstan/phpstan",
220-
"version": "2.1.13",
221-
"version_normalized": "2.1.13.0",
222+
"version": "2.1.21",
223+
"version_normalized": "2.1.21.0",
222224
"source": {
223225
"type": "git",
224226
"url": "https://github.com/phpstan/phpstan.git",
225-
"reference": "e55e03e6d4ac49cd1240907e5b08e5cd378572a9"
227+
"reference": "1ccf445757458c06a04eb3f803603cb118fe5fa6"
226228
},
227229
"dist": {
228230
"type": "zip",
229-
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/e55e03e6d4ac49cd1240907e5b08e5cd378572a9",
230-
"reference": "e55e03e6d4ac49cd1240907e5b08e5cd378572a9",
231+
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/1ccf445757458c06a04eb3f803603cb118fe5fa6",
232+
"reference": "1ccf445757458c06a04eb3f803603cb118fe5fa6",
231233
"shasum": ""
232234
},
233235
"require": {
@@ -236,7 +238,7 @@
236238
"conflict": {
237239
"phpstan/phpstan-shim": "*"
238240
},
239-
"time": "2025-04-27T12:28:25+00:00",
241+
"time": "2025-07-28T19:35:08+00:00",
240242
"bin": [
241243
"phpstan",
242244
"phpstan.phar"
@@ -278,17 +280,17 @@
278280
},
279281
{
280282
"name": "phpstan/phpstan-strict-rules",
281-
"version": "2.0.4",
282-
"version_normalized": "2.0.4.0",
283+
"version": "2.0.6",
284+
"version_normalized": "2.0.6.0",
283285
"source": {
284286
"type": "git",
285287
"url": "https://github.com/phpstan/phpstan-strict-rules.git",
286-
"reference": "3e139cbe67fafa3588e1dbe27ca50f31fdb6236a"
288+
"reference": "f9f77efa9de31992a832ff77ea52eb42d675b094"
287289
},
288290
"dist": {
289291
"type": "zip",
290-
"url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/3e139cbe67fafa3588e1dbe27ca50f31fdb6236a",
291-
"reference": "3e139cbe67fafa3588e1dbe27ca50f31fdb6236a",
292+
"url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/f9f77efa9de31992a832ff77ea52eb42d675b094",
293+
"reference": "f9f77efa9de31992a832ff77ea52eb42d675b094",
292294
"shasum": ""
293295
},
294296
"require": {
@@ -301,7 +303,7 @@
301303
"phpstan/phpstan-phpunit": "^2.0",
302304
"phpunit/phpunit": "^9.6"
303305
},
304-
"time": "2025-03-18T11:42:40+00:00",
306+
"time": "2025-07-21T12:19:29+00:00",
305307
"type": "phpstan-extension",
306308
"extra": {
307309
"phpstan": {
@@ -323,7 +325,7 @@
323325
"description": "Extra strict and opinionated rules for PHPStan",
324326
"support": {
325327
"issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
326-
"source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.4"
328+
"source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.6"
327329
},
328330
"install-path": "../phpstan/phpstan-strict-rules"
329331
},

0 commit comments

Comments
 (0)