Skip to content

Commit 54d9813

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '12.3'
* 12.3: Remove assertion that is no longer needed Update tools
2 parents be275ca + 574f8b3 commit 54d9813

File tree

9 files changed

+41
-38
lines changed

9 files changed

+41
-38
lines changed

‎src/Logging/OpenTestReporting/InfrastructureInformationProvider.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use function function_exists;
1818
use function getenv;
1919
use function gethostname;
20-
use function is_array;
2120
use function is_resource;
2221
use function php_uname;
2322
use function posix_geteuid;
@@ -168,7 +167,6 @@ private function executeGitCommand(string $command): false|string
168167
return false;
169168
}
170169

171-
assert(is_array($pipes));
172170
assert(isset($pipes[1]) && is_resource($pipes[1]));
173171
assert(isset($pipes[2]) && is_resource($pipes[2]));
174172

‎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.28",
3+
"phpstan/phpstan": "^2.1.29",
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: 7 additions & 7 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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -221,17 +221,17 @@
221221
},
222222
{
223223
"name": "phpstan/phpstan",
224-
"version": "2.1.28",
225-
"version_normalized": "2.1.28.0",
224+
"version": "2.1.29",
225+
"version_normalized": "2.1.29.0",
226226
"source": {
227227
"type": "git",
228-
"url": "https://github.com/phpstan/phpstan.git",
229-
"reference": "578fa296a166605d97b94091f724f1257185d278"
228+
"url": "https://github.com/phpstan/phpstan-phar-composer-source.git",
229+
"reference": "git"
230230
},
231231
"dist": {
232232
"type": "zip",
233-
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/578fa296a166605d97b94091f724f1257185d278",
234-
"reference": "578fa296a166605d97b94091f724f1257185d278",
233+
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/d618573eed4a1b6b75e37b2e0b65ac65c885d88e",
234+
"reference": "d618573eed4a1b6b75e37b2e0b65ac65c885d88e",
235235
"shasum": ""
236236
},
237237
"require": {
@@ -240,7 +240,7 @@
240240
"conflict": {
241241
"phpstan/phpstan-shim": "*"
242242
},
243-
"time": "2025-09-19T08:58:49+00:00",
243+
"time": "2025-09-25T06:58:18+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' => '88b48564fa6aefc604f43abec37217c8b5829c9e',
6+
'reference' => '4d49069cb5c3519111fcb5efb9d9a8eea678e961',
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' => '88b48564fa6aefc604f43abec37217c8b5829c9e',
16+
'reference' => '4d49069cb5c3519111fcb5efb9d9a8eea678e961',
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.28',
51-
'version' => '2.1.28.0',
52-
'reference' => '578fa296a166605d97b94091f724f1257185d278',
50+
'pretty_version' => '2.1.29',
51+
'version' => '2.1.29.0',
52+
'reference' => 'd618573eed4a1b6b75e37b2e0b65ac65c885d88e',
5353
'type' => 'library',
5454
'install_path' => __DIR__ . '/../phpstan/phpstan',
5555
'aliases' => array(),

‎tools/.phpstan/vendor/phpstan/extension-installer/src/GeneratedConfig.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ final class GeneratedConfig
1212
public const EXTENSIONS = array (
1313
'ergebnis/phpstan-rules' =>
1414
array (
15-
'install_path' => '/usr/local/src/phpunit/tools/.phpstan/vendor/ergebnis/phpstan-rules',
15+
'install_path' => '/Users/sb/Work/OpenSource/phpunit/tools/.phpstan/vendor/ergebnis/phpstan-rules',
1616
'relative_install_path' => '../../../ergebnis/phpstan-rules',
1717
'extra' =>
1818
array (
@@ -26,7 +26,7 @@ final class GeneratedConfig
2626
),
2727
'phpstan/phpstan-strict-rules' =>
2828
array (
29-
'install_path' => '/usr/local/src/phpunit/tools/.phpstan/vendor/phpstan/phpstan-strict-rules',
29+
'install_path' => '/Users/sb/Work/OpenSource/phpunit/tools/.phpstan/vendor/phpstan/phpstan-strict-rules',
3030
'relative_install_path' => '../../phpstan-strict-rules',
3131
'extra' =>
3232
array (
@@ -40,7 +40,7 @@ final class GeneratedConfig
4040
),
4141
'tomasvotruba/type-coverage' =>
4242
array (
43-
'install_path' => '/usr/local/src/phpunit/tools/.phpstan/vendor/tomasvotruba/type-coverage',
43+
'install_path' => '/Users/sb/Work/OpenSource/phpunit/tools/.phpstan/vendor/tomasvotruba/type-coverage',
4444
'relative_install_path' => '../../../tomasvotruba/type-coverage',
4545
'extra' =>
4646
array (

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
"autoload": {
1717
"files": ["bootstrap.php"]
1818
},
19+
"source": {
20+
"type": "git",
21+
"url": "https://github.com/phpstan/phpstan-phar-composer-source.git",
22+
"reference": "git"
23+
},
1924
"support": {
2025
"issues": "https://github.com/phpstan/phpstan/issues",
2126
"forum": "https://github.com/phpstan/phpstan/discussions",

‎tools/.phpstan/vendor/phpstan/phpstan/phpstan.phar‎

9.33 KB
Binary file not shown.

‎tools/.phpstan/vendor/phpstan/phpstan/phpstan.phar.asc‎

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/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
3+
iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmjU5+gACgkQUcZzBf/C
4+
5cAsfg/7Ba9duYiO9tl4AaiTLkSN9Obp7/gkrbQCbtRmjJ7L3RdqeGXqVzl0MGu3
5+
EbfVx8FrIuz6Ei6b30tYzTBPbTxdQFnsCmLTRn7u9Luqi35UXon0NKKcJBv2jFDS
6+
xTGl3BEA/TtjCEQc8ZWEtapeDzuQqjZBuvk4rFTYKXMHdekyw7zOR/FwtaUSon3/
7+
ISvG/nna5jut5spw03jn6HqJ0y2c0Cr3y6UvXB/H3Qy8pkIP21DzBM3juRYD1bh0
8+
AHjyZ4AKS/a3LnLzSoMo1lwKWfxa3/SXX4f6NAf8D/QIrYpsJKX661+LIZ1CzK/u
9+
Kl9R5lbwTDycpGS309IkkKnRAKeedbvVIFuxcAM1jlCmJWgLSUTOCFP8ZwMHFqf1
10+
+W8FcK1spKUanG7WmsJuFXxd9dDLSaQIMfkUCd0JoGgtmr1yMs8a+XZbngtLmhv2
11+
y57efu4ogGd6zC8xuCLRt71o1TU/hd/hizDd7Hn7M/yN8/dsNmQyzcD6+NcnRilw
12+
c0JsvUlcqXiTvbP6VT8YrTOdwjy33sijXa8CxzpBJaWP9YXS9XNvLTDsdN/ooH8/
13+
JghI5QEGAyqOwPEKJnv3JRs0qErvnONx+Gi452psWzFaMWQQ1l6ACpD9sih+LCYO
14+
936uBc+rjxcBjGFbMNx8ZyD3bmxkjHbmJGI0O+J8rBzurLSSdAw=
15+
=LCr3
1616
-----END PGP SIGNATURE-----

0 commit comments

Comments
 (0)