Skip to content

Commit ab8cb04

Browse files
Merge branch '11.5' into 12.3
* 11.5: Fix Update tools
2 parents 88b4856 + 0e997e5 commit ab8cb04

File tree

9 files changed

+33
-33
lines changed

9 files changed

+33
-33
lines changed

.phive/phars.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<phar name="phpab" version="^1.29" installed="1.29.3" location="./tools/phpab" copy="true"/>
44
<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"/>
6-
<phar name="composer" version="^2.8" installed="2.8.11" location="./tools/composer" copy="true"/>
6+
<phar name="composer" version="^2.8" installed="2.8.12" location="./tools/composer" copy="true"/>
77
</phive>

src/Runner/CodeCoverage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public function init(Configuration $configuration, CodeCoverageFilterRegistry $c
159159
}
160160

161161
/**
162-
* @phpstan-assert-if-true !null $this->instance
162+
* @phpstan-assert-if-true !null $this->codeCoverage
163163
*/
164164
public function isActive(): bool
165165
{

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.25",
3+
"phpstan/phpstan": "^2.1.28",
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: 6 additions & 6 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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,17 +221,17 @@
221221
},
222222
{
223223
"name": "phpstan/phpstan",
224-
"version": "2.1.25",
225-
"version_normalized": "2.1.25.0",
224+
"version": "2.1.28",
225+
"version_normalized": "2.1.28.0",
226226
"source": {
227227
"type": "git",
228228
"url": "https://github.com/phpstan/phpstan.git",
229-
"reference": "4087d28bd252895874e174d65e26b2c202ed893a"
229+
"reference": "578fa296a166605d97b94091f724f1257185d278"
230230
},
231231
"dist": {
232232
"type": "zip",
233-
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/4087d28bd252895874e174d65e26b2c202ed893a",
234-
"reference": "4087d28bd252895874e174d65e26b2c202ed893a",
233+
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/578fa296a166605d97b94091f724f1257185d278",
234+
"reference": "578fa296a166605d97b94091f724f1257185d278",
235235
"shasum": ""
236236
},
237237
"require": {
@@ -240,7 +240,7 @@
240240
"conflict": {
241241
"phpstan/phpstan-shim": "*"
242242
},
243-
"time": "2025-09-12T14:26:42+00:00",
243+
"time": "2025-09-19T08:58:49+00:00",
244244
"bin": [
245245
"phpstan",
246246
"phpstan.phar"

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' => '8b89a4ab366be08b1d92369bf39b56d64fef2b3b',
6+
'reference' => '88b48564fa6aefc604f43abec37217c8b5829c9e',
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' => '8b89a4ab366be08b1d92369bf39b56d64fef2b3b',
16+
'reference' => '88b48564fa6aefc604f43abec37217c8b5829c9e',
1717
'type' => 'library',
1818
'install_path' => __DIR__ . '/../../',
1919
'aliases' => array(),
@@ -47,9 +47,9 @@
4747
'dev_requirement' => true,
4848
),
4949
'phpstan/phpstan' => array(
50-
'pretty_version' => '2.1.25',
51-
'version' => '2.1.25.0',
52-
'reference' => '4087d28bd252895874e174d65e26b2c202ed893a',
50+
'pretty_version' => '2.1.28',
51+
'version' => '2.1.28.0',
52+
'reference' => '578fa296a166605d97b94091f724f1257185d278',
5353
'type' => 'library',
5454
'install_path' => __DIR__ . '/../phpstan/phpstan',
5555
'aliases' => array(),
79.9 KB
Binary file not shown.
Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
-----BEGIN PGP SIGNATURE-----
22

3-
iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmjELX8ACgkQUcZzBf/C
4-
5cCVdg//U69LB4uyv+6rxEnJXtX0qvEQUFqHyQ+ItvKUu04RUxddc+9mfgWn674N
5-
ArtC1688BhbUVCW+bRnwbfj2EFQOMr1xCflz+RhrfYA9Jlgj3VrnTnOpUjfyBZJm
6-
K2uEWDmJ7f5aupP0XszZN2ktfn7mSsc5r8c67RzPl5B5+p4CfC48CVwHkdrw6UBV
7-
pntQlR1Ax81Qcool+WaqXHCAu/n7bT83PCQQSLhxDKZHc6GJJPmK1+Jw7BglAtdo
8-
dRW7fFi/6SZ4FzmX7g/8rG+d02pWFP3OMIC98qFZPxM9b7PdZ7tBvYClFJwgBp55
9-
tdxAgXkll8QI1czdinIJsE0wlqmVWe1TUZegFpNjQQpQjKVqhhc7hmcGC+N2nP1W
10-
lfTC8l/VH2QalwItgOVOrinMGI+voOGV7R3gI/GG3ZOUAkG3bsk5I57sw5BgRpi7
11-
rUgmPg+oMi6UIH1d7PLTBxnRpRIV0XMyirUYePPjUOPL5dvJM7BznSq8LzZ5wf4I
12-
3chJ9u+gyw5cF8ot4HyJD4NWUvr2R50Gs7ScL9HnSOvqr2dbrLTNepAjbWZn2nUj
13-
JIL0ff9zx8Fv62IpD4HiR/ukU7kfPJuJ3hVZonn7kSpcW23Wfs6aOHKJOkPMZKcV
14-
9p/YQl824COpVO/xxxXI+W2Z5AohWDoEix4jZ/7k8dAgO56lvKU=
15-
=a7mV
3+
iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmjNGyEACgkQUcZzBf/C
4+
5cCyExAAmDcbTOVhPlAYAuH9Jdegk4x19Ax4BzQqkIV021xVGsNysyg0aIPtqCUH
5+
XpXZI0oA8plPhIctiobpyYqg4Ou2T/Y5PxxFVLhiD12AxDEa+Iy765BNeZCRRj3W
6+
VQQyDo1gj4y9N1Tmj4CihbIXNcxhXM8OMirekDPvEQmofYrp5bgXvwbyhmFsKwq/
7+
ToGURtUFZg8GB68FnR3SviRJgxg1z/iKA0keIYFg78tJtAgzS7eBNWBwpfWMHs8b
8+
2Sy87IJG0JVeq7x44ktLi5pUfi5sFwqF7cpFLnnBhFcaM+Z81KpwpfVmuvhArBsy
9+
Jw0iGsi2LilzPCyTETmv6YMMrzmyhsAmibVzEHUpGtoI+Qq2QiXfu1hhVG7nS+Bx
10+
VtUPeXu+XlXaXnFE/xm06mootkjs6NAaREKFrH/kCnH9mT5d5eRqb1KrO/hViAUC
11+
tGflHeuYY2BnDthpy3orOmmO+qEdTxu6M24G6ANL4RRbcad0+IC/R6+UCYy+XZlc
12+
QHgO2UGJw6tEvqZqhBoLpd9PEljyOdEmiCBlq4sXUnXiZvGplQzM4l0tqaaAK7AT
13+
+gsuo73rR6JcRMPagsOZ4WGae/s7wolq8uTclNSzM+EGTfgk6zI/1H1dFBtDGAdA
14+
q6bTMydHKDrTDPscsNDYPJ2OLq1tRE+LX6pojuOGadmetq5k000=
15+
=PLj2
1616
-----END PGP SIGNATURE-----

tools/composer

964 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)