Skip to content

Commit 3ec5a1c

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '11.0'
2 parents 05c33d0 + b967f2e commit 3ec5a1c

31 files changed

+274
-147
lines changed

‎.phive/phars.xml

+2-2
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.72.0" location="./tools/php-cs-fixer" copy="true"/>
4-
<phar name="composer" version="^2.8" installed="2.8.6" location="./tools/composer" copy="true"/>
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.7" location="./tools/composer" copy="true"/>
55
</phive>

‎tools/.phpstan/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"require-dev": {
3-
"phpstan/phpstan": "^2.1.8",
3+
"phpstan/phpstan": "^2.1.11",
44
"phpstan/extension-installer": "^1.4.3",
5-
"phpstan/phpstan-strict-rules": "^2.0.3",
5+
"phpstan/phpstan-strict-rules": "^2.0.4",
66
"tomasvotruba/type-coverage": "^2.0.2",
77
"ergebnis/phpstan-rules": "^2.8.0"
88
},

‎tools/.phpstan/composer.lock

+18-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/.phpstan/vendor/autoload.php

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
echo $err;
1515
}
1616
}
17-
trigger_error(
18-
$err,
19-
E_USER_ERROR
20-
);
17+
throw new RuntimeException($err);
2118
}
2219

2320
require_once __DIR__ . '/composer/autoload_real.php';

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

+19-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626
*/
2727
class InstalledVersions
2828
{
29+
/**
30+
* @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
31+
* @internal
32+
*/
33+
private static $selfDir = null;
34+
2935
/**
3036
* @var mixed[]|null
3137
* @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
@@ -322,6 +328,18 @@ public static function reload($data)
322328
self::$installedIsLocalDir = false;
323329
}
324330

331+
/**
332+
* @return string
333+
*/
334+
private static function getSelfDir()
335+
{
336+
if (self::$selfDir === null) {
337+
self::$selfDir = strtr(__DIR__, '\\', '/');
338+
}
339+
340+
return self::$selfDir;
341+
}
342+
325343
/**
326344
* @return array[]
327345
* @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
@@ -336,7 +354,7 @@ private static function getInstalled()
336354
$copiedLocalDir = false;
337355

338356
if (self::$canGetVendors) {
339-
$selfDir = strtr(__DIR__, '\\', '/');
357+
$selfDir = self::getSelfDir();
340358
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
341359
$vendorDir = strtr($vendorDir, '\\', '/');
342360
if (isset(self::$installedByVendor[$vendorDir])) {

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

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
'Nette\\NotImplementedException' => $vendorDir . '/nette/utils/src/exceptions.php',
2424
'Nette\\NotSupportedException' => $vendorDir . '/nette/utils/src/exceptions.php',
2525
'Nette\\OutOfRangeException' => $vendorDir . '/nette/utils/src/exceptions.php',
26+
'Nette\\ShouldNotHappenException' => $vendorDir . '/nette/utils/src/exceptions.php',
2627
'Nette\\SmartObject' => $vendorDir . '/nette/utils/src/SmartObject.php',
2728
'Nette\\StaticClass' => $vendorDir . '/nette/utils/src/StaticClass.php',
2829
'Nette\\UnexpectedValueException' => $vendorDir . '/nette/utils/src/exceptions.php',

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

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ class ComposerStaticInitf9e7218f71d5874b5632927df4f72bd7
6363
'Nette\\NotImplementedException' => __DIR__ . '/..' . '/nette/utils/src/exceptions.php',
6464
'Nette\\NotSupportedException' => __DIR__ . '/..' . '/nette/utils/src/exceptions.php',
6565
'Nette\\OutOfRangeException' => __DIR__ . '/..' . '/nette/utils/src/exceptions.php',
66+
'Nette\\ShouldNotHappenException' => __DIR__ . '/..' . '/nette/utils/src/exceptions.php',
6667
'Nette\\SmartObject' => __DIR__ . '/..' . '/nette/utils/src/SmartObject.php',
6768
'Nette\\StaticClass' => __DIR__ . '/..' . '/nette/utils/src/StaticClass.php',
6869
'Nette\\UnexpectedValueException' => __DIR__ . '/..' . '/nette/utils/src/exceptions.php',

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

+20-20
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,17 @@
7777
},
7878
{
7979
"name": "nette/utils",
80-
"version": "v4.0.5",
81-
"version_normalized": "4.0.5.0",
80+
"version": "v4.0.6",
81+
"version_normalized": "4.0.6.0",
8282
"source": {
8383
"type": "git",
8484
"url": "https://github.com/nette/utils.git",
85-
"reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96"
85+
"reference": "ce708655043c7050eb050df361c5e313cf708309"
8686
},
8787
"dist": {
8888
"type": "zip",
89-
"url": "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
90-
"reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
89+
"url": "https://api.github.com/repos/nette/utils/zipball/ce708655043c7050eb050df361c5e313cf708309",
90+
"reference": "ce708655043c7050eb050df361c5e313cf708309",
9191
"shasum": ""
9292
},
9393
"require": {
@@ -111,7 +111,7 @@
111111
"ext-mbstring": "to use Strings::lower() etc...",
112112
"ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()"
113113
},
114-
"time": "2024-08-07T15:39:19+00:00",
114+
"time": "2025-03-30T21:06:30+00:00",
115115
"type": "library",
116116
"extra": {
117117
"branch-alias": {
@@ -160,7 +160,7 @@
160160
],
161161
"support": {
162162
"issues": "https://github.com/nette/utils/issues",
163-
"source": "https://github.com/nette/utils/tree/v4.0.5"
163+
"source": "https://github.com/nette/utils/tree/v4.0.6"
164164
},
165165
"install-path": "../nette/utils"
166166
},
@@ -217,17 +217,17 @@
217217
},
218218
{
219219
"name": "phpstan/phpstan",
220-
"version": "2.1.8",
221-
"version_normalized": "2.1.8.0",
220+
"version": "2.1.11",
221+
"version_normalized": "2.1.11.0",
222222
"source": {
223223
"type": "git",
224224
"url": "https://github.com/phpstan/phpstan.git",
225-
"reference": "f9adff3b87c03b12cc7e46a30a524648e497758f"
225+
"reference": "8ca5f79a8f63c49b2359065832a654e1ec70ac30"
226226
},
227227
"dist": {
228228
"type": "zip",
229-
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/f9adff3b87c03b12cc7e46a30a524648e497758f",
230-
"reference": "f9adff3b87c03b12cc7e46a30a524648e497758f",
229+
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/8ca5f79a8f63c49b2359065832a654e1ec70ac30",
230+
"reference": "8ca5f79a8f63c49b2359065832a654e1ec70ac30",
231231
"shasum": ""
232232
},
233233
"require": {
@@ -236,7 +236,7 @@
236236
"conflict": {
237237
"phpstan/phpstan-shim": "*"
238238
},
239-
"time": "2025-03-09T09:30:48+00:00",
239+
"time": "2025-03-24T13:45:00+00:00",
240240
"bin": [
241241
"phpstan",
242242
"phpstan.phar"
@@ -278,17 +278,17 @@
278278
},
279279
{
280280
"name": "phpstan/phpstan-strict-rules",
281-
"version": "2.0.3",
282-
"version_normalized": "2.0.3.0",
281+
"version": "2.0.4",
282+
"version_normalized": "2.0.4.0",
283283
"source": {
284284
"type": "git",
285285
"url": "https://github.com/phpstan/phpstan-strict-rules.git",
286-
"reference": "8b88b5f818bfa301e0c99154ab622dace071c3ba"
286+
"reference": "3e139cbe67fafa3588e1dbe27ca50f31fdb6236a"
287287
},
288288
"dist": {
289289
"type": "zip",
290-
"url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/8b88b5f818bfa301e0c99154ab622dace071c3ba",
291-
"reference": "8b88b5f818bfa301e0c99154ab622dace071c3ba",
290+
"url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/3e139cbe67fafa3588e1dbe27ca50f31fdb6236a",
291+
"reference": "3e139cbe67fafa3588e1dbe27ca50f31fdb6236a",
292292
"shasum": ""
293293
},
294294
"require": {
@@ -301,7 +301,7 @@
301301
"phpstan/phpstan-phpunit": "^2.0",
302302
"phpunit/phpunit": "^9.6"
303303
},
304-
"time": "2025-01-21T10:52:14+00:00",
304+
"time": "2025-03-18T11:42:40+00:00",
305305
"type": "phpstan-extension",
306306
"extra": {
307307
"phpstan": {
@@ -323,7 +323,7 @@
323323
"description": "Extra strict and opinionated rules for PHPStan",
324324
"support": {
325325
"issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
326-
"source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.3"
326+
"source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.4"
327327
},
328328
"install-path": "../phpstan/phpstan-strict-rules"
329329
},

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'name' => '__root__',
44
'pretty_version' => 'dev-main',
55
'version' => 'dev-main',
6-
'reference' => 'd331a5ced3d9a2b917baa9841b2211e72f9e780d',
6+
'reference' => '05c33d01a856f9f62488d144bafddc3d7b7a4ebb',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -13,7 +13,7 @@
1313
'__root__' => array(
1414
'pretty_version' => 'dev-main',
1515
'version' => 'dev-main',
16-
'reference' => 'd331a5ced3d9a2b917baa9841b2211e72f9e780d',
16+
'reference' => '05c33d01a856f9f62488d144bafddc3d7b7a4ebb',
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.5',
33-
'version' => '4.0.5.0',
34-
'reference' => '736c567e257dbe0fcf6ce81b4d6dbe05c6899f96',
32+
'pretty_version' => 'v4.0.6',
33+
'version' => '4.0.6.0',
34+
'reference' => 'ce708655043c7050eb050df361c5e313cf708309',
3535
'type' => 'library',
3636
'install_path' => __DIR__ . '/../nette/utils',
3737
'aliases' => array(),
@@ -47,18 +47,18 @@
4747
'dev_requirement' => true,
4848
),
4949
'phpstan/phpstan' => array(
50-
'pretty_version' => '2.1.8',
51-
'version' => '2.1.8.0',
52-
'reference' => 'f9adff3b87c03b12cc7e46a30a524648e497758f',
50+
'pretty_version' => '2.1.11',
51+
'version' => '2.1.11.0',
52+
'reference' => '8ca5f79a8f63c49b2359065832a654e1ec70ac30',
5353
'type' => 'library',
5454
'install_path' => __DIR__ . '/../phpstan/phpstan',
5555
'aliases' => array(),
5656
'dev_requirement' => true,
5757
),
5858
'phpstan/phpstan-strict-rules' => array(
59-
'pretty_version' => '2.0.3',
60-
'version' => '2.0.3.0',
61-
'reference' => '8b88b5f818bfa301e0c99154ab622dace071c3ba',
59+
'pretty_version' => '2.0.4',
60+
'version' => '2.0.4.0',
61+
'reference' => '3e139cbe67fafa3588e1dbe27ca50f31fdb6236a',
6262
'type' => 'phpstan-extension',
6363
'install_path' => __DIR__ . '/../phpstan/phpstan-strict-rules',
6464
'aliases' => array(),

‎tools/.phpstan/vendor/nette/utils/src/Utils/Arrays.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,8 @@ public static function flatten(array $array, bool $preserveKeys = false): array
277277
*/
278278
public static function isList(mixed $value): bool
279279
{
280-
return is_array($value) && (PHP_VERSION_ID < 80100
280+
return is_array($value) && (
281+
PHP_VERSION_ID < 80100
281282
? !$value || array_keys($value) === range(0, count($value) - 1)
282283
: array_is_list($value)
283284
);

0 commit comments

Comments
 (0)