Skip to content

Commit 8d195ce

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '12.2'
2 parents a62124f + 56e1c0e commit 8d195ce

File tree

14 files changed

+59
-37
lines changed

14 files changed

+59
-37
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>

‎src/TextUI/Configuration/Xml/CodeCoverage/CodeCoverage.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public function openClover(): OpenClover
184184
);
185185
}
186186

187-
return $this->openClover();
187+
return $this->openClover;
188188
}
189189

190190
/**

‎tests/_files/configuration_codecoverage.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<cobertura outputFile="cobertura.xml"/>
3030
<crap4j outputFile="crap4j.xml" threshold="30"/>
3131
<html outputDirectory="coverage" lowUpperBound="50" highLowerBound="90"/>
32-
<openclover outputFile="clover.xml"/>
32+
<openclover outputFile="openclover.xml"/>
3333
<php outputFile="coverage.php"/>
3434
<text outputFile="coverage.txt" showUncoveredFiles="false" showOnlySummary="true"/>
3535
<xml outputDirectory="coverage"/>

‎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
{

‎tests/unit/TextUI/Configuration/Xml/LoaderTest.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,9 @@ public function testCodeCoverageConfigurationIsReadCorrectly(): void
193193
$this->assertTrue($codeCoverage->hasClover());
194194
$this->assertSame(TEST_FILES_PATH . 'clover.xml', $codeCoverage->clover()->target()->path());
195195

196+
$this->assertTrue($codeCoverage->hasOpenClover());
197+
$this->assertSame(TEST_FILES_PATH . 'openclover.xml', $codeCoverage->openClover()->target()->path());
198+
196199
$this->assertTrue($codeCoverage->hasCobertura());
197200
$this->assertSame(TEST_FILES_PATH . 'cobertura.xml', $codeCoverage->cobertura()->target()->path());
198201

‎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' => 'dev-main',
55
'version' => 'dev-main',
6-
'reference' => '8586cc36111f3ac6a474d0a15ccb021d1068fc34',
6+
'reference' => 'a62124f38b2e3c17b2e338dfe5ff9d4ff6279363',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -13,7 +13,7 @@
1313
'__root__' => array(
1414
'pretty_version' => 'dev-main',
1515
'version' => 'dev-main',
16-
'reference' => '8586cc36111f3ac6a474d0a15ccb021d1068fc34',
16+
'reference' => 'a62124f38b2e3c17b2e338dfe5ff9d4ff6279363',
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)

0 commit comments

Comments
 (0)