Skip to content

Commit 555cd5e

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '11.0'
* 11.0: Update tools Update dependencies
2 parents 5b74f62 + 574c8b6 commit 555cd5e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+269
-262
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.86" installed="3.89.2" location="./tools/php-cs-fixer" copy="true"/>
4-
<phar name="composer" version="^2.8" installed="2.9.1" location="./tools/composer" copy="true"/>
3+
<phar name="php-cs-fixer" version="^3.86" installed="3.91.3" location="./tools/php-cs-fixer" copy="true"/>
4+
<phar name="composer" version="^2.8" installed="2.9.2" location="./tools/composer" copy="true"/>
55
</phive>

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"ext-dom": "*",
3434
"ext-libxml": "*",
3535
"ext-xmlwriter": "*",
36-
"nikic/php-parser": "^5.6.2",
36+
"nikic/php-parser": "^5.7.0",
3737
"phpunit/php-file-iterator": "^6.0",
3838
"phpunit/php-text-template": "^5.0",
3939
"sebastian/complexity": "^5.0",
@@ -43,7 +43,7 @@
4343
"theseer/tokenizer": "^2.0"
4444
},
4545
"require-dev": {
46-
"phpunit/phpunit": "^12.4.4"
46+
"phpunit/phpunit": "^12.5.1"
4747
},
4848
"suggest": {
4949
"ext-pcov": "PHP extension that provides line coverage",

‎tools/.phpstan/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"require-dev": {
3-
"phpstan/phpstan": "^2.1.32",
3+
"phpstan/phpstan": "^2.1.33",
44
"phpstan/extension-installer": "^1.4.3",
55
"phpstan/phpstan-strict-rules": "^2.0.7",
6-
"tomasvotruba/type-coverage": "^2.0.2",
6+
"tomasvotruba/type-coverage": "^2.1.0",
77
"ergebnis/phpstan-rules": "^2.12.0"
88
},
99
"config": {

‎tools/.phpstan/composer.lock‎

Lines changed: 19 additions & 19 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: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,21 @@
7878
},
7979
{
8080
"name": "nette/utils",
81-
"version": "v4.0.8",
82-
"version_normalized": "4.0.8.0",
81+
"version": "v4.1.0",
82+
"version_normalized": "4.1.0.0",
8383
"source": {
8484
"type": "git",
8585
"url": "https://github.com/nette/utils.git",
86-
"reference": "c930ca4e3cf4f17dcfb03037703679d2396d2ede"
86+
"reference": "fa1f0b8261ed150447979eb22e373b7b7ad5a8e0"
8787
},
8888
"dist": {
8989
"type": "zip",
90-
"url": "https://api.github.com/repos/nette/utils/zipball/c930ca4e3cf4f17dcfb03037703679d2396d2ede",
91-
"reference": "c930ca4e3cf4f17dcfb03037703679d2396d2ede",
90+
"url": "https://api.github.com/repos/nette/utils/zipball/fa1f0b8261ed150447979eb22e373b7b7ad5a8e0",
91+
"reference": "fa1f0b8261ed150447979eb22e373b7b7ad5a8e0",
9292
"shasum": ""
9393
},
9494
"require": {
95-
"php": "8.0 - 8.5"
95+
"php": "8.2 - 8.5"
9696
},
9797
"conflict": {
9898
"nette/finder": "<3",
@@ -112,11 +112,11 @@
112112
"ext-mbstring": "to use Strings::lower() etc...",
113113
"ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()"
114114
},
115-
"time": "2025-08-06T21:43:34+00:00",
115+
"time": "2025-12-01T17:49:23+00:00",
116116
"type": "library",
117117
"extra": {
118118
"branch-alias": {
119-
"dev-master": "4.0-dev"
119+
"dev-master": "4.1-dev"
120120
}
121121
},
122122
"installation-source": "dist",
@@ -164,7 +164,7 @@
164164
],
165165
"support": {
166166
"issues": "https://github.com/nette/utils/issues",
167-
"source": "https://github.com/nette/utils/tree/v4.0.8"
167+
"source": "https://github.com/nette/utils/tree/v4.1.0"
168168
},
169169
"install-path": "../nette/utils"
170170
},
@@ -221,12 +221,12 @@
221221
},
222222
{
223223
"name": "phpstan/phpstan",
224-
"version": "2.1.32",
225-
"version_normalized": "2.1.32.0",
224+
"version": "2.1.33",
225+
"version_normalized": "2.1.33.0",
226226
"dist": {
227227
"type": "zip",
228-
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/e126cad1e30a99b137b8ed75a85a676450ebb227",
229-
"reference": "e126cad1e30a99b137b8ed75a85a676450ebb227",
228+
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/9e800e6bee7d5bd02784d4c6069b48032d16224f",
229+
"reference": "9e800e6bee7d5bd02784d4c6069b48032d16224f",
230230
"shasum": ""
231231
},
232232
"require": {
@@ -235,7 +235,7 @@
235235
"conflict": {
236236
"phpstan/phpstan-shim": "*"
237237
},
238-
"time": "2025-11-11T15:18:17+00:00",
238+
"time": "2025-12-05T10:24:31+00:00",
239239
"bin": [
240240
"phpstan",
241241
"phpstan.phar"
@@ -328,25 +328,25 @@
328328
},
329329
{
330330
"name": "tomasvotruba/type-coverage",
331-
"version": "2.0.2",
332-
"version_normalized": "2.0.2.0",
331+
"version": "2.1.0",
332+
"version_normalized": "2.1.0.0",
333333
"source": {
334334
"type": "git",
335335
"url": "https://github.com/TomasVotruba/type-coverage.git",
336-
"reference": "d033429580f2c18bda538fa44f2939236a990e0c"
336+
"reference": "468354b3964120806a69890cbeb3fcf005876391"
337337
},
338338
"dist": {
339339
"type": "zip",
340-
"url": "https://api.github.com/repos/TomasVotruba/type-coverage/zipball/d033429580f2c18bda538fa44f2939236a990e0c",
341-
"reference": "d033429580f2c18bda538fa44f2939236a990e0c",
340+
"url": "https://api.github.com/repos/TomasVotruba/type-coverage/zipball/468354b3964120806a69890cbeb3fcf005876391",
341+
"reference": "468354b3964120806a69890cbeb3fcf005876391",
342342
"shasum": ""
343343
},
344344
"require": {
345345
"nette/utils": "^3.2 || ^4.0",
346346
"php": "^7.4 || ^8.0",
347347
"phpstan/phpstan": "^2.0"
348348
},
349-
"time": "2025-01-07T00:10:26+00:00",
349+
"time": "2025-12-05T16:38:02+00:00",
350350
"type": "phpstan-extension",
351351
"extra": {
352352
"phpstan": {
@@ -372,7 +372,7 @@
372372
],
373373
"support": {
374374
"issues": "https://github.com/TomasVotruba/type-coverage/issues",
375-
"source": "https://github.com/TomasVotruba/type-coverage/tree/2.0.2"
375+
"source": "https://github.com/TomasVotruba/type-coverage/tree/2.1.0"
376376
},
377377
"funding": [
378378
{

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

Lines changed: 11 additions & 11 deletions
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' => '37047b5f0e98b31dccb9b7e7241e4f66ebfcd358',
6+
'reference' => '5b74f6242eb0baf4414dd15033afd51abc0bb45d',
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' => '37047b5f0e98b31dccb9b7e7241e4f66ebfcd358',
16+
'reference' => '5b74f6242eb0baf4414dd15033afd51abc0bb45d',
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.8',
33-
'version' => '4.0.8.0',
34-
'reference' => 'c930ca4e3cf4f17dcfb03037703679d2396d2ede',
32+
'pretty_version' => 'v4.1.0',
33+
'version' => '4.1.0.0',
34+
'reference' => 'fa1f0b8261ed150447979eb22e373b7b7ad5a8e0',
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.32',
51-
'version' => '2.1.32.0',
52-
'reference' => 'e126cad1e30a99b137b8ed75a85a676450ebb227',
50+
'pretty_version' => '2.1.33',
51+
'version' => '2.1.33.0',
52+
'reference' => '9e800e6bee7d5bd02784d4c6069b48032d16224f',
5353
'type' => 'library',
5454
'install_path' => __DIR__ . '/../phpstan/phpstan',
5555
'aliases' => array(),
@@ -65,9 +65,9 @@
6565
'dev_requirement' => true,
6666
),
6767
'tomasvotruba/type-coverage' => array(
68-
'pretty_version' => '2.0.2',
69-
'version' => '2.0.2.0',
70-
'reference' => 'd033429580f2c18bda538fa44f2939236a990e0c',
68+
'pretty_version' => '2.1.0',
69+
'version' => '2.1.0.0',
70+
'reference' => '468354b3964120806a69890cbeb3fcf005876391',
7171
'type' => 'phpstan-extension',
7272
'install_path' => __DIR__ . '/../tomasvotruba/type-coverage',
7373
'aliases' => array(),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616
],
1717
"require": {
18-
"php": "8.0 - 8.5"
18+
"php": "8.2 - 8.5"
1919
},
2020
"require-dev": {
2121
"nette/tester": "^2.5",
@@ -48,7 +48,7 @@
4848
},
4949
"extra": {
5050
"branch-alias": {
51-
"dev-master": "4.0-dev"
51+
"dev-master": "4.1-dev"
5252
}
5353
}
5454
}

‎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.5.
44+
Nette Utils 4.1 is compatible with PHP 8.2 to 8.5.
4545

4646
 <!---->
4747

‎tools/.phpstan/vendor/nette/utils/src/Iterators/CachingIterator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class CachingIterator extends \CachingIterator implements \Countable
3434
public function __construct(iterable|\stdClass $iterable)
3535
{
3636
$iterable = $iterable instanceof \stdClass
37-
? new \ArrayIterator($iterable)
37+
? new \ArrayIterator((array) $iterable)
3838
: Nette\Utils\Iterables::toIterator($iterable);
3939
parent::__construct($iterable, 0);
4040
}

‎tools/.phpstan/vendor/nette/utils/src/StaticClass.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,4 @@ trait StaticClass
2121
private function __construct()
2222
{
2323
}
24-
25-
26-
/**
27-
* Call to undefined static method.
28-
* @throws MemberAccessException
29-
*/
30-
public static function __callStatic(string $name, array $args): mixed
31-
{
32-
Utils\ObjectHelpers::strictStaticCall(static::class, $name);
33-
}
3424
}

0 commit comments

Comments
 (0)