Skip to content

Commit c233107

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '11.5' into 12.3
2 parents 72b3b55 + 58a7ec8 commit c233107

File tree

9 files changed

+36
-38
lines changed

9 files changed

+36
-38
lines changed

‎src/Runner/ErrorHandler.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private function __construct(Source $source)
8888
/**
8989
* @throws NoTestCaseObjectOnCallStackException
9090
*/
91-
public function __invoke(int $errorNumber, string $errorString, string $errorFile, int $errorLine): bool
91+
public function __invoke(int $errorNumber, string $errorString, string $errorFile, int $errorLine): false
9292
{
9393
$suppressed = (error_reporting() & ~self::INSUPPRESSIBLE_LEVELS) === 0;
9494

‎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.22",
3+
"phpstan/phpstan": "^2.1.23",
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.22",
225-
"version_normalized": "2.1.22.0",
224+
"version": "2.1.23",
225+
"version_normalized": "2.1.23.0",
226226
"source": {
227227
"type": "git",
228228
"url": "https://github.com/phpstan/phpstan.git",
229-
"reference": "41600c8379eb5aee63e9413fe9e97273e25d57e4"
229+
"reference": "a34502adbbd5c2366b5a97679848a5ace4f6f2f5"
230230
},
231231
"dist": {
232232
"type": "zip",
233-
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/41600c8379eb5aee63e9413fe9e97273e25d57e4",
234-
"reference": "41600c8379eb5aee63e9413fe9e97273e25d57e4",
233+
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/a34502adbbd5c2366b5a97679848a5ace4f6f2f5",
234+
"reference": "a34502adbbd5c2366b5a97679848a5ace4f6f2f5",
235235
"shasum": ""
236236
},
237237
"require": {
@@ -240,7 +240,7 @@
240240
"conflict": {
241241
"phpstan/phpstan-shim": "*"
242242
},
243-
"time": "2025-08-04T19:17:37+00:00",
243+
"time": "2025-09-10T11:42:22+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' => '020397b781c493d09a28ef435ae3cff93f9ac47b',
6+
'reference' => '72b3b553bf4d7920b22832d045532000ad0c4c63',
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' => '020397b781c493d09a28ef435ae3cff93f9ac47b',
16+
'reference' => '72b3b553bf4d7920b22832d045532000ad0c4c63',
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.22',
51-
'version' => '2.1.22.0',
52-
'reference' => '41600c8379eb5aee63e9413fe9e97273e25d57e4',
50+
'pretty_version' => '2.1.23',
51+
'version' => '2.1.23.0',
52+
'reference' => 'a34502adbbd5c2366b5a97679848a5ace4f6f2f5',
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/README.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Want your logo here? [Learn more »](https://phpstan.org/sponsor)
6060
<br>
6161
<a href="https://join.rightcapital.com/?utm_source=phpstan&utm_medium=github&utm_campaign=sponsorship"><img src="website/src/images/sponsor/rightcapital.png" alt="RightCapital" width="283" height="64"></a>
6262
&nbsp;&nbsp;&nbsp;
63-
<a href="https://www.contentkingapp.com/?ref=php-developer&utm_source=phpstan&utm_medium=referral&utm_campaign=sponsorship"><img src="website/src/images/sponsor/contentking.png" alt="ContentKing" width="283" height="64"></a>
63+
<a href="https://www.shoptet.cz/"><img src="website/src/images/sponsor/shoptet.png" alt="Shoptet" width="283" height="64"></a>
6464
<br>
6565
<a href="https://zol.fr?utm_source=phpstan"><img src="website/src/images/sponsor/zol.png" alt="ZOL" width="283" height="64"></a>
6666
&nbsp;&nbsp;&nbsp;
@@ -78,8 +78,6 @@ Want your logo here? [Learn more »](https://phpstan.org/sponsor)
7878
&nbsp;&nbsp;&nbsp;
7979
<a href="https://inviqa.com/"><img src="website/src/images/sponsor/inviqa.png" alt="Inviqa" width="254" height="65"></a>
8080
<br>
81-
<a href="https://www.shoptet.cz/"><img src="website/src/images/sponsor/shoptet.png" alt="Shoptet" width="283" height="64"></a>
82-
&nbsp;&nbsp;&nbsp;
8381

8482

8583

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

108 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/C5cAFAmiRBzAACgkQUcZzBf/C
4-
5cBT9A//bFN1PIaNFWyowUaBTRJJ5bZ5ztqIar8C872t6S3mZmjEicE7d9X8gbWg
5-
sAAJO0hL6rH2bMUJDx4xksCGOcctI2WHauVa02JhzRXM3MKNh1UsfapHWA379j+3
6-
hwly1F/+fPklDS0W3zigWNlz0W7TFc4g8AL1CtAGeBOaFxeFmVPOU54UkfOy5YBT
7-
PuyxprZ473hZFrdbFRAanp95FLatLSZ9TL53M4SysyLewc6dOoO790l4zdMgYu74
8-
OxPAdgqZEzHCNOB60mKSFs6W3df9pXsoWvd0W8h9WVmre0COjzgaItDfhJRc+ODN
9-
sR/5ibIaPfhydCSj2tEoLWzNVy2EZpKv7rEBZji81qLcGCe+rC9T+RYygzJKoZ5z
10-
iHOXFmFK/GGevbPFVeN8Tiss3A5wkbNnJGSe3twegwa03IAiJkcqZfwCqRlrHTnH
11-
+k0KsuEB8mpfoYNGhda8u0AFWWIH1QU1//1OhXW3/t7mu/pCcavpXRlIcm8vJGfI
12-
++GWH160+xC4oeX35pbsoHq7c7aWtpeVDobjB1C+Kdhjh/HLkranM5jg/CeYt1ol
13-
EVdQ9rqIVEZdDXcziA0hI+ueM9mf995aMjyAzkis7Oy13EC6PZGjabErNjPRX0oN
14-
wU0YFwBv9hXCUDZN+3U9gzfu8WTNjYYMDE8q7EjbdnXj1+9YJGc=
15-
=owzd
3+
iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmjBY/oACgkQUcZzBf/C
4+
5cCNOBAAitJwWS4FvpgTZ1SaBxsuKlu+AT55StiEfWY7NV7L1AuQUR39T/MPAJr1
5+
wzWune3Gx+Hlrwx6x2KPW83Xoi41L8xKz1xV1bBGQjj0k4ERdjdnogl/0sBBjnAz
6+
yn4qPYS4MBxhooK+hC0/2lmUHxi58ja48mRn7cP59LUB+pc4ygGWJxaH03Ukb108
7+
cQGBdek0l2+1frmQZMDPPfYOdCenllNxlo3J+QfIF1+vJNklaHQ42YcgKVsJWtdo
8+
hXRb5JNHs5TcV7phYoZdigtIcNBEwjvBgHU5klTgQgrE10pehwhrMryDw6oc/ckq
9+
GafRJXTR4Px0jdNKSB9Lg7bRCc8umAxk4/K2KFLs15kMEiqglZ+EwYze0LbC9zBc
10+
7uwKkTo4+NwM9pGrCJONQx3Ly9zYnv3Eb8PuRUC4l79gKNAPkr4nrIqNDitS1ky4
11+
C7cM4TJ8qK+S8BZfqm/tfLwLQGlbaHzHeT8JryjE+wPCKKEfIEExdAStWN89jqn7
12+
hRtBjWwHH6O4mOpXgfQD/RDhpWO5eN4YhVrGP6KaUk8E04ZFxz5alT4VZCVFwrO/
13+
t26CRlUNHfdEA59M8uqhj9Y572hX+sDCIBo13V7pvBWfHcjWsh109C3ZC3KC7hz4
14+
7aZL429Ax3S34M0HRmzHnCPHEPdGU/M4Qm5DXtZHH+o6SoqqxTw=
15+
=9Z7b
1616
-----END PGP SIGNATURE-----

0 commit comments

Comments
 (0)