Skip to content

Commit 94086a4

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '11.5' into 12.2
2 parents 015b773 + f8342e4 commit 94086a4

File tree

11 files changed

+54
-35
lines changed

11 files changed

+54
-35
lines changed

‎.phive/phars.xml

Lines changed: 2 additions & 2 deletions
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.82.2" location="./tools/php-cs-fixer" copy="true"/>
4+
<phar name="php-cs-fixer" version="^3.80" installed="3.84.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.9" location="./tools/composer" copy="true"/>
6+
<phar name="composer" version="^2.8" installed="2.8.10" location="./tools/composer" copy="true"/>
77
</phive>

‎tests/unit/TextUI/Configuration/Cli/BuilderTest.php

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,6 +1563,26 @@ public function testDoNotFailOnPhpunitNoticeMayNotBeConfigured(): void
15631563
$configuration->doNotFailOnPhpunitNotice();
15641564
}
15651565

1566+
#[TestDox('--do-not-fail-on-phpunit-warning')]
1567+
public function testDoNotFailOnPhpunitWarning(): void
1568+
{
1569+
$configuration = (new Builder)->fromParameters(['--do-not-fail-on-phpunit-warning']);
1570+
1571+
$this->assertTrue($configuration->hasDoNotFailOnPhpunitWarning());
1572+
$this->assertTrue($configuration->doNotFailOnPhpunitWarning());
1573+
}
1574+
1575+
public function testDoNotFailOnPhpunitWarningMayNotBeConfigured(): void
1576+
{
1577+
$configuration = (new Builder)->fromParameters([]);
1578+
1579+
$this->assertFalse($configuration->hasDoNotFailOnPhpunitWarning());
1580+
1581+
$this->expectException(Exception::class);
1582+
1583+
$configuration->doNotFailOnPhpunitWarning();
1584+
}
1585+
15661586
#[TestDox('--do-not-fail-on-empty-test-suite')]
15671587
public function testDoNotFailOnEmptyTestSuite(): void
15681588
{

‎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.17",
3+
"phpstan/phpstan": "^2.1.18",
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
@@ -219,17 +219,17 @@
219219
},
220220
{
221221
"name": "phpstan/phpstan",
222-
"version": "2.1.17",
223-
"version_normalized": "2.1.17.0",
222+
"version": "2.1.18",
223+
"version_normalized": "2.1.18.0",
224224
"source": {
225225
"type": "git",
226226
"url": "https://github.com/phpstan/phpstan.git",
227-
"reference": "89b5ef665716fa2a52ecd2633f21007a6a349053"
227+
"reference": "ee1f390b7a70cdf74a2b737e554f68afea885db7"
228228
},
229229
"dist": {
230230
"type": "zip",
231-
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/89b5ef665716fa2a52ecd2633f21007a6a349053",
232-
"reference": "89b5ef665716fa2a52ecd2633f21007a6a349053",
231+
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/ee1f390b7a70cdf74a2b737e554f68afea885db7",
232+
"reference": "ee1f390b7a70cdf74a2b737e554f68afea885db7",
233233
"shasum": ""
234234
},
235235
"require": {
@@ -238,7 +238,7 @@
238238
"conflict": {
239239
"phpstan/phpstan-shim": "*"
240240
},
241-
"time": "2025-05-21T20:55:28+00:00",
241+
"time": "2025-07-17T17:22:31+00:00",
242242
"bin": [
243243
"phpstan",
244244
"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.2.x-dev',
55
'version' => '12.2.9999999.9999999-dev',
6-
'reference' => 'b3f3a3f609fd9a55db9013792446190b08731195',
6+
'reference' => '015b77379230e5dc165546f2f43b10e9069ce466',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -13,7 +13,7 @@
1313
'__root__' => array(
1414
'pretty_version' => '12.2.x-dev',
1515
'version' => '12.2.9999999.9999999-dev',
16-
'reference' => 'b3f3a3f609fd9a55db9013792446190b08731195',
16+
'reference' => '015b77379230e5dc165546f2f43b10e9069ce466',
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.17',
51-
'version' => '2.1.17.0',
52-
'reference' => '89b5ef665716fa2a52ecd2633f21007a6a349053',
50+
'pretty_version' => '2.1.18',
51+
'version' => '2.1.18.0',
52+
'reference' => 'ee1f390b7a70cdf74a2b737e554f68afea885db7',
5353
'type' => 'library',
5454
'install_path' => __DIR__ . '/../phpstan/phpstan',
5555
'aliases' => array(),

‎tools/.phpstan/vendor/phpstan/phpstan/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ can be checked before you run the actual line.
5252
&nbsp;&nbsp;&nbsp;
5353
<a href="https://craftcms.com/"><img src="website/src/images/sponsor/craftcms.png" alt="Craft CMS" width="283" height="64"></a>
5454
<br>
55-
<a href="https://www.worksome.com/"><img src="website/src/images/sponsor/worksome.png" alt="Worksome" width="283" height="64"></a>
55+
<a href="https://jobs.ticketswap.com/"><img src="website/src/images/sponsor/ticketswap.png" alt="TicketSwap" width="269" height="64"></a>
5656
&nbsp;&nbsp;&nbsp;
5757
<a href="https://www.campoint.net/"><img src="website/src/images/sponsor/campoint.png" alt="campoint AG" width="283" height="64"></a>
5858
<br>
@@ -66,7 +66,6 @@ can be checked before you run the actual line.
6666
<br>
6767
<a href="https://werkenbijbelsimpel.nl/en/about-us/"><img src="website/src/images/sponsor/belsimpel.png" alt="Belsimpel" width="284" height="64"></a>
6868
&nbsp;&nbsp;&nbsp;
69-
<a href="https://jobs.ticketswap.com/"><img src="website/src/images/sponsor/ticketswap.png" alt="TicketSwap" width="269" height="64"></a>
7069

7170

7271
[**You can now sponsor my open-source work on PHPStan through GitHub Sponsors.**](https://github.com/sponsors/ondrejmirtes)

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

980 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/C5cAFAmguPZUACgkQUcZzBf/C
4-
5cAEvA//ZhuFf/BKaChoEylgToqYpo7SXpIR0UBkEKCTw5TYgFQC1vTBcIL6tbFC
5-
mHiemXmbkFeCGPVnaThFPf4yav5A5NH62VXMXv74F3g+pvB2Z7pHMRjBTleiP6Mr
6-
isnynMK1+/oN69dAeRnxuoJ2ohYLgChbVcfkpSPjz0AqLyFkrgRmWop2BnW4oI6T
7-
dSWIJjO1N465FHESbrm7d/MlpturoC3jADMibpafeOeAN4PerElJrOocGKZctkS2
8-
gVRQAPud3s8Rud3GL9sMcfqnlbNCx4iar/30W15XOOL8OxWBocVIrvYLXjpqKMJx
9-
3GQL1Y3g9NNjjQK3i8cMX2XmpIVXT7GNq1dYr5MyJ6uMtQDR61qEUf7GlMBfvzT0
10-
0SwuyqHcuIQV9KO10u/IBcJ0mdUQm4oDBSiUQk1dKawRVcExx8j5v1OfjzEpfPYj
11-
jdTEtvVcB2TudeKAnQ8hHf6vhCLQtxDHUV03KrkFaF5PsWG3eQwCbWczjJLEE+Th
12-
xQLVtD0iLGU+nivRZg37xqSvgS2nBnilAxrnrVDXU5xYcVqMz2e8mw6aDNYQADDX
13-
P7Znr5rw1rUwDw82vLdssLdt06H2P9F9ZuOi+bxh9+o4BHpXy08TzPAt64is3mKn
14-
pLH0SmR5AUwxCGMVLLKHlxPe/E3xcIQDIik8NvcqFW5FeaYUeek=
15-
=7S+6
3+
iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmh5MTAACgkQUcZzBf/C
4+
5cDv3w//XELzb17IEtMi6fabpRcK/73YTLNAD6Ov9dWNYR5gejrLffGZvUmGtGuj
5+
Fwcq0bcbadz6OZ/B7oGnINYnOOl8kn6qCqW3idD/hZGfJehFIKOe/3AcQMqhc35r
6+
I8yR1yvwymEmW+8QLy7wg9qZGJv1q5Bkv1oqhRa4cMhyQEPP0PrtrRVs2EPb+66l
7+
+wizjELTLNXTv5VdmskSLrytt7uMJKG39uHNcJMxB6vY4fcGeGXtqUcaRrpW+NT2
8+
pgXmMqj4c4+8CDFp0rz0pUfx1HRSeWLdjtN60TJQT2FzMA9Yb/lr29OlYAPFf3rG
9+
hX0PejvOCv+vB3L2Gx2WteIV5PfyOo/kcdfqPdsy06gAIpIDIl7fWtMsHqyA6wi9
10+
k7M68u9rCa+xiEXtLmfezzVGKVyZdjIurCt2oJQGqzRGphD4F1wV8P0sbB/3T3YA
11+
a2oZ00xV0/PAjy3BbiLGOLDInpbZHe708zvefm8sB0e2IbhxMKzgFABC6gG1uD2a
12+
oAGshiMAga/39/zc23+P8SyfX/XqBkxQAncHLFKr2bDqv89bCyxBTdWvUKUaGC1P
13+
l0pBX+MNsVhFK0ZMywQ/2UtssedBgW1Kej0lkUKaiXodzpU5GPCC36JSmtgbxy+V
14+
trPaav5wy96Pr3OzzLwKvc3G6joBS5cZI5gaembJPofECJEeA/I=
15+
=NezH
1616
-----END PGP SIGNATURE-----

‎tools/composer

-8.74 KB
Binary file not shown.

0 commit comments

Comments
 (0)