Skip to content

Commit cced563

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '11.5' into 12.3
2 parents 264da86 + ff657ac commit cced563

File tree

9 files changed

+39
-39
lines changed

9 files changed

+39
-39
lines changed

‎.phive/phars.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
33
<phar name="phpab" version="^1.29" installed="1.29.3" location="./tools/phpab" copy="true"/>
4-
<phar name="php-cs-fixer" version="^3.80" installed="3.84.0" location="./tools/php-cs-fixer" copy="true"/>
4+
<phar name="php-cs-fixer" version="^3.80" installed="3.85.1" 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"/>
66
<phar name="composer" version="^2.8" installed="2.8.10" location="./tools/composer" copy="true"/>
77
</phive>

‎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.20",
3+
"phpstan/phpstan": "^2.1.21",
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
@@ -219,17 +219,17 @@
219219
},
220220
{
221221
"name": "phpstan/phpstan",
222-
"version": "2.1.20",
223-
"version_normalized": "2.1.20.0",
222+
"version": "2.1.21",
223+
"version_normalized": "2.1.21.0",
224224
"source": {
225225
"type": "git",
226226
"url": "https://github.com/phpstan/phpstan.git",
227-
"reference": "a9ccfef95210f92ba6feea6e8d1eef42b5605499"
227+
"reference": "1ccf445757458c06a04eb3f803603cb118fe5fa6"
228228
},
229229
"dist": {
230230
"type": "zip",
231-
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/a9ccfef95210f92ba6feea6e8d1eef42b5605499",
232-
"reference": "a9ccfef95210f92ba6feea6e8d1eef42b5605499",
231+
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/1ccf445757458c06a04eb3f803603cb118fe5fa6",
232+
"reference": "1ccf445757458c06a04eb3f803603cb118fe5fa6",
233233
"shasum": ""
234234
},
235235
"require": {
@@ -238,7 +238,7 @@
238238
"conflict": {
239239
"phpstan/phpstan-shim": "*"
240240
},
241-
"time": "2025-07-26T20:45:26+00:00",
241+
"time": "2025-07-28T19:35:08+00:00",
242242
"bin": [
243243
"phpstan",
244244
"phpstan.phar"

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?php return array(
22
'root' => array(
33
'name' => '__root__',
4-
'pretty_version' => 'dev-main',
5-
'version' => 'dev-main',
6-
'reference' => '8d195ce2922031c670c90d8286955946a992ef06',
4+
'pretty_version' => '12.3.x-dev',
5+
'version' => '12.3.9999999.9999999-dev',
6+
'reference' => '264da860d6fe0d00582355a6ecbbf7ae57b44895',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
1010
'dev' => true,
1111
),
1212
'versions' => array(
1313
'__root__' => array(
14-
'pretty_version' => 'dev-main',
15-
'version' => 'dev-main',
16-
'reference' => '8d195ce2922031c670c90d8286955946a992ef06',
14+
'pretty_version' => '12.3.x-dev',
15+
'version' => '12.3.9999999.9999999-dev',
16+
'reference' => '264da860d6fe0d00582355a6ecbbf7ae57b44895',
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.20',
51-
'version' => '2.1.20.0',
52-
'reference' => 'a9ccfef95210f92ba6feea6e8d1eef42b5605499',
50+
'pretty_version' => '2.1.21',
51+
'version' => '2.1.21.0',
52+
'reference' => '1ccf445757458c06a04eb3f803603cb118fe5fa6',
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/phpstan.phar

20.4 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/C5cAFAmiFPkAACgkQUcZzBf/C
4-
5cDElQ//SAYHrXtq0FFgN0DbOVyC8HS2xZkQ6uIsZUjsZns3S1puCAVVWLfzFO4N
5-
xbxg7ONR1XUHJ1PfjSPav+qPNtxjAv+HIRhB/WUZ5RKzJQwE2jzpqCRsqDRJTv+R
6-
sxY0tJ5/1pHP/NbxEtUt32Vmxim755KQbjNui/y2BIk4krMIf7Ob7xuwK9MkEgeN
7-
GoixcQXB8lUwWuvksLd3guoAkfRab6+Os9ldALpc8QGKUGIVUKUBdY6Mbkjtrvwo
8-
B/hbHgko1JdQAXVT/bkbyT3X6BUvccAaPoXlpp9dBTGfve80Jc/G9C8El18E93Iq
9-
Y6MN7ASjFYsUe2OtdI/HtOSmmIbjHluQ7XdXEVh8MsitPp5tLS1WvSttup8Jk+Rc
10-
P6uMviVVdibT9bZeC14nVBOiepZrqnAg8+To6nCBZJHJZqKHz5ulC6WomYASifgD
11-
sLxgjXEdyc/LcrQKgmWK6uikcTJ2CSGVXs6CTVDO6CxyKYCy88NYjBDwz/JLee37
12-
N0592ZzMfiajzmWI7JNB9qY+x5qXeGx5vnlabUWJAblS9fmWgZGbyQNIxmWXCoCf
13-
dmNSJNZ2FijxZIuXTimoAwfabjXiCerdM3yOpQhwIHKZg9dVx58BYL4NSKQ8oaly
14-
IvoE6SY5cFfkR8KdwJzK2pBXWsVBE8GPowmpLDPTDOgr3NZT2Tw=
15-
=3pvu
3+
iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmiH0MMACgkQUcZzBf/C
4+
5cB4GRAAladOYQWUE2XHwwyhl/baoJEkPyPVbRmwZakva0Hg9kksH62fDwM944cE
5+
NZCFWnuKn/ujVFLnd4vCVctibsKjM9EPTdugAFrmEna52JGfFFrb+0oj5VblRDc9
6+
CaSK6WJwcIDZI8xkmeO5m1fKCWosq99FzrATJkpXnB8vn/ODTT9OLVvi/3mU8h6B
7+
TY5/RX3KKlc8iKE6tyQ+OljX4iMicyxC3CuISRuzP04hK7Mx+U4xAtaJa5Uv7aDH
8+
LKdWpkiRMnDK8GklrSyrpdAl80J3KFt5aKX9m/mwb77tSujDTOkoOU5GfaamSNKX
9+
CvyfuvoDn8tO5a8YeqbBsaje5GBWI9nuMrHG2zNEjNepYCk0N0dDclah1tu9sjs5
10+
mQNnEuI2Gj3b1O+rNbPRgwgOgUk7OjyRX/rvUotw013PQKclSWhEhY2mcpyla5bw
11+
vq1Xfjf5eXbu610cxQnSnFG13DlIleMTbqXFXD4ICpiKYeOOCLSQf8+X7+WVlUjW
12+
90/TrhV+VpsWILdjVBvceemgqcR5SyWRZe4Xx+FqsSFnJmmnRkK6d/sILnXrYug+
13+
FZVJutuUJN2HKa/vlm23BNOca8evEngUfqua/ykbanugJwBxy0HynfyzVRXa33Ud
14+
WQ2MXepBMBC4ogwjCnyAw5wfc2uAnWSXf4yHTcWfvAlzMmpDHfQ=
15+
=nV2o
1616
-----END PGP SIGNATURE-----

‎tools/php-cs-fixer

3.23 KB
Binary file not shown.

0 commit comments

Comments
 (0)