Skip to content

Commit 1f9de10

Browse files
Merge branch '11.4' into 11.5
2 parents ac2a438 + c396291 commit 1f9de10

File tree

8 files changed

+8
-14
lines changed

8 files changed

+8
-14
lines changed

.phive/phars.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
<phar name="php-cs-fixer" version="^3.64" installed="3.64.0" location="./tools/php-cs-fixer" copy="true"/>
55
<phar name="humbug/php-scoper" version="^0.18" installed="0.18.15" location="./tools/php-scoper" copy="true"/>
66
<phar name="composer" version="^2.8" installed="2.8.3" location="./tools/composer" copy="true"/>
7-
<phar name="phpstan" version="^1.12" installed="1.12.11" location="./tools/phpstan" copy="true"/>
7+
<phar name="phpstan" version="^2.0" installed="2.0.2" location="./tools/phpstan" copy="true"/>
88
</phive>

src/Framework/Constraint/IsAnything.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
*/
1010
namespace PHPUnit\Framework\Constraint;
1111

12-
use PHPUnit\Framework\ExpectationFailedException;
13-
1412
/**
1513
* @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
1614
*/
@@ -25,8 +23,6 @@ final class IsAnything extends Constraint
2523
* If $returnResult is true, the result of the evaluation is returned as
2624
* a boolean value instead: true in case of success, false in case of a
2725
* failure.
28-
*
29-
* @throws ExpectationFailedException
3026
*/
3127
public function evaluate(mixed $other, string $description = '', bool $returnResult = false): ?bool
3228
{

src/Framework/MockObject/Generator/Generator.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,9 @@ private function generateCodeForTestDoubleClass(string $type, bool $mockObject,
811811
}
812812

813813
/** @var trait-string[] $traits */
814-
$traits = [];
814+
$traits = [];
815+
816+
/** @phpstan-ignore identical.alwaysTrue */
815817
$isPhp82 = PHP_MAJOR_VERSION === 8 && PHP_MINOR_VERSION === 2;
816818

817819
if (!$isReadonly && $isPhp82) {
@@ -1103,7 +1105,7 @@ private function instantiateProxyTarget(?object $proxyTarget, object $object, st
11031105
*
11041106
* @throws ReflectionException
11051107
*
1106-
* @phpstan-ignore missingType.generics
1108+
* @phpstan-ignore missingType.generics, throws.unusedType
11071109
*/
11081110
private function reflectClass(string $className): ReflectionClass
11091111
{

src/Framework/TestRunner/TestRunner.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use function assert;
1414
use function extension_loaded;
1515
use function sprintf;
16+
use function xdebug_is_debugger_active;
1617
use AssertionError;
1718
use PHPUnit\Event\Facade;
1819
use PHPUnit\Metadata\Api\CodeCoverage as CodeCoverageMetadataApi;

src/Logging/JUnit/JunitXmlLogger.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,17 +184,11 @@ public function testPreparationStarted(PreparationStarted $event): void
184184
$this->createTestCase($event);
185185
}
186186

187-
/**
188-
* @throws InvalidArgumentException
189-
*/
190187
public function testPreparationFailed(): void
191188
{
192189
$this->preparationFailed = true;
193190
}
194191

195-
/**
196-
* @throws InvalidArgumentException
197-
*/
198192
public function testPrepared(): void
199193
{
200194
$this->prepared = true;

src/Util/PHP/DefaultJobRunner.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
use function tempnam;
2828
use function trim;
2929
use function unlink;
30+
use function xdebug_is_debugger_active;
3031
use PHPUnit\Event\Facade;
3132
use PHPUnit\Runner\CodeCoverage;
3233
use SebastianBergmann\Environment\Runtime;

tests/_files/skip-if-requires-code-coverage-driver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
print 'skip: This test requires a code coverage driver';
1717
}
1818

19-
if (\version_compare(\phpversion('xdebug'), '3.1', '>=') && \in_array('coverage', xdebug_info('mode'), true)) {
19+
if (\version_compare(\phpversion('xdebug'), '3.1', '>=') && \in_array('coverage', \xdebug_info('mode'), true)) {
2020
return;
2121
}
2222

tools/phpstan

-165 KB
Binary file not shown.

0 commit comments

Comments
 (0)