Skip to content

Commit 7445126

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '11.5' into 12.1
2 parents 1257cf0 + 239ad55 commit 7445126

File tree

10 files changed

+92
-95
lines changed

10 files changed

+92
-95
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.69" installed="3.75.0" 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.7" location="./tools/composer" copy="true"/>
6+
<phar name="composer" version="^2.8" installed="2.8.8" 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.11",
3+
"phpstan/phpstan": "^2.1.12",
44
"phpstan/extension-installer": "^1.4.3",
55
"phpstan/phpstan-strict-rules": "^2.0.4",
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
@@ -217,17 +217,17 @@
217217
},
218218
{
219219
"name": "phpstan/phpstan",
220-
"version": "2.1.11",
221-
"version_normalized": "2.1.11.0",
220+
"version": "2.1.12",
221+
"version_normalized": "2.1.12.0",
222222
"source": {
223223
"type": "git",
224224
"url": "https://github.com/phpstan/phpstan.git",
225-
"reference": "8ca5f79a8f63c49b2359065832a654e1ec70ac30"
225+
"reference": "96dde49e967c0c22812bcfa7bda4ff82c09f3b0c"
226226
},
227227
"dist": {
228228
"type": "zip",
229-
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/8ca5f79a8f63c49b2359065832a654e1ec70ac30",
230-
"reference": "8ca5f79a8f63c49b2359065832a654e1ec70ac30",
229+
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/96dde49e967c0c22812bcfa7bda4ff82c09f3b0c",
230+
"reference": "96dde49e967c0c22812bcfa7bda4ff82c09f3b0c",
231231
"shasum": ""
232232
},
233233
"require": {
@@ -236,7 +236,7 @@
236236
"conflict": {
237237
"phpstan/phpstan-shim": "*"
238238
},
239-
"time": "2025-03-24T13:45:00+00:00",
239+
"time": "2025-04-16T13:19:18+00:00",
240240
"bin": [
241241
"phpstan",
242242
"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' => '56ac8de3a635180e1f0c80f70d4f6680bfe81cb3',
4+
'pretty_version' => '12.1.x-dev',
5+
'version' => '12.1.9999999.9999999-dev',
6+
'reference' => '1257cf02e51e2f7b6b84358ee1495ed8a21b188b',
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' => '56ac8de3a635180e1f0c80f70d4f6680bfe81cb3',
14+
'pretty_version' => '12.1.x-dev',
15+
'version' => '12.1.9999999.9999999-dev',
16+
'reference' => '1257cf02e51e2f7b6b84358ee1495ed8a21b188b',
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.11',
51-
'version' => '2.1.11.0',
52-
'reference' => '8ca5f79a8f63c49b2359065832a654e1ec70ac30',
50+
'pretty_version' => '2.1.12',
51+
'version' => '2.1.12.0',
52+
'reference' => '96dde49e967c0c22812bcfa7bda4ff82c09f3b0c',
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' => '/Users/sb/Work/OpenSource/phpunit/tools/.phpstan/vendor/ergebnis/phpstan-rules',
15+
'install_path' => '/usr/local/src/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' => '/Users/sb/Work/OpenSource/phpunit/tools/.phpstan/vendor/phpstan/phpstan-strict-rules',
29+
'install_path' => '/usr/local/src/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' => '/Users/sb/Work/OpenSource/phpunit/tools/.phpstan/vendor/tomasvotruba/type-coverage',
43+
'install_path' => '/usr/local/src/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

75.7 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/C5cAFAmfhYbcACgkQUcZzBf/C
4-
5cA7ig//Uiolw2ay3yGcivb/OfIzK1/rndxp/R5MpBQtcZK95e18R/EEHm55wx1L
5-
1VCpalmHm0FcgE5e/2jbs0bUsq/n3zzye3jL5398j0Cc2IKuOXmjbdgyEehgPmkU
6-
v32urtgP0/zYNMh81DPdVK5YokBbkVOm/FICTQ/qTO8oGzE+sIIh6P7VKnJ9fmLs
7-
jWbV+2kBSnzO8KHuO0W5F/s5H2VlUJdXrt5mzmSk3bhO7Yze36qlS4pJvGM19Kw1
8-
2x/T+agp1TNRoKhLXuKs1TXqx3VavY05VyGpCduGo39QFxKzqpGTy39LCCOmQ4yR
9-
Y/JJxCpolspTK0lmQyiKIMklopMssmPZeLOopRVc7keKPXd99LLU70DYDWdWgbao
10-
nQFpy2ojOM/8oF8AX/Z4X8FwY0utnu2AZi3nqOUMKfcD53zrKs3yNKHJeFND+Wz4
11-
VvjJCFSSSt3xEAmr2b42HTiHVW4UcZcWxUDm64GmS7FCTQN6UI/1YLEgSoS/tA6m
12-
LGuj3tUzReww9oFIcLPEW/JwnciFMH8cb1PxFQQHZmQ674Gk5TPidU2JJXV7Zt2j
13-
i15wUNi80LTeB73nJoVB/IwZNoSaCQjL+JGCiLK9Wm9UjBT4y07Xb5B6oMGwCgQu
14-
zaJ2c//Lr/urhjM6HdVgSAsGLipRZC3o/03JYl3IcyhxtoohZUQ=
15-
=8tzR
3+
iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmf/rjEACgkQUcZzBf/C
4+
5cAJBg//eWTSJb/xAfpBShRY765IyXcvm8JutsEERiqJ3nNKb9vTc1jmSg2Ck2e5
5+
GzdJc06UCOQVc6b6dOptaoAzYjgn0/oIukTAdRnHVWdVwBxiOKj2dyo6Me1Rw2o3
6+
7tEiqxFGBAN10dxP1tqfiP/sfvY9O44SFBYyjINuALqSqaPndWKjniruXuhoeASf
7+
+c/3NZRmL6poYHbA0QE1pqYZJAXaverTuAGPTfm4JReuuuD+hX+dR8dXceiRKSFI
8+
WFTl/bXscJwMm/sfqmFutL0I4oKeOO9X/XznBCuEMzfqQut5xPghQ1O6jNi9Za1F
9+
l1rGWbeavbYCsydsxh77+6CZWYQexX/iXfkePH6BN0+nkZ9J1V8MziHEWWppEUTY
10+
YM/5gciZSF3tnO2KAAte26MnkrYO3KMn2eny4vHrJC1gcGrZqUhBwa90e3yJNxj1
11+
Uq3Wm4qok2/JoNeoth4wJWMa5bA9AD6IvFY9fHuFRmoYR/f9QD+yHTobcZNThBsA
12+
hcYot2UkvrBeH9QMqPsvH5EB2vG+gcx8vvIxobadI4JBtXIkKdwgGDZZ4qOt8zgj
13+
L6MYd63JwmmCJmLOx4v/98/MXcbpYUC4r4B4F8QAAy9ocpvIe4THeXxG48FJwNTw
14+
KNh+VNQGHOJUVxXRppEkF1JfCMkg4yf1RVIEQTvfXb+sXoUw4iY=
15+
=iR01
1616
-----END PGP SIGNATURE-----

‎tools/composer

32 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)