Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .dev-tools/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
"require": {
"php": "^8.4",
"ergebnis/composer-normalize": "^2.48.2",
"infection/infection": "^0.31.2",
"infection/infection": "^0.31.9",
"kubawerlos/composer-smaller-lock": "^1.1.0",
"kubawerlos/php-cs-fixer-config": "^5.5",
"kubawerlos/php-cs-fixer-config": "^5.6",
"mi-schi/phpmd-extension": "^4.3",
"phpmd/phpmd": "^2.15",
"phpstan/extension-installer": "^1.4.3",
"phpstan/phpstan": "^2.1.29",
"phpstan/phpstan-phpunit": "^2.0.7",
"phpstan/phpstan": "^2.1.32",
"phpstan/phpstan-phpunit": "^2.0.8",
"phpstan/phpstan-strict-rules": "^2.0.7",
"shipmonk/composer-dependency-analyser": "^1.8.3",
"shipmonk/dead-code-detector": "^0.13.3",
"shipmonk/dead-code-detector": "^0.13.5",
"shipmonk/phpstan-rules": "^4.2.1",
"squizlabs/php_codesniffer": "^4.0",
"squizlabs/php_codesniffer": "^4.0.1",
"tomasvotruba/type-coverage": "^2.0.2",
"vimeo/psalm": "^6.13.1"
},
Expand Down
187 changes: 92 additions & 95 deletions .dev-tools/composer.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"friendsofphp/php-cs-fixer": "^3.87"
},
"require-dev": {
"phpunit/phpunit": "^9.6.24 || ^10.5.51 || ^11.5.32"
"phpunit/phpunit": "^9.6.24 || ^10.5.51 || ^11.5.44"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 3 additions & 1 deletion tests/AutoReview/SrcCodeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public function testThereIsNoDisallowedFunctionUsedDirectly(string $className):
}

/**
* @return iterable<array{string}>
* @return iterable<array{class-string}>
*/
public static function provideThereIsNoDisallowedFunctionUsedDirectlyCases(): iterable
{
Expand All @@ -142,6 +142,8 @@ public static function provideThereIsNoDisallowedFunctionUsedDirectlyCases(): it
if ($file->getRelativePath() !== '') {
$namespace .= '\\' . \str_replace('/', '\\', $file->getRelativePath());
}

/** @var class-string $className */
$className = $namespace . '\\' . $file->getBasename('.php');

yield $className => [$className];
Expand Down
12 changes: 7 additions & 5 deletions tests/AutoReview/TestsCodeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,11 @@ public function testDataProvidersValues(string $className): void
}

/**
* @return iterable<string, array{string}>
* @return iterable<string, array{class-string}>
*/
public static function provideTestClassCases(): iterable
{
/** @var \ArrayIterator<string, array{string}> */
/** @var \ArrayIterator<string, array{class-string}> */
static $tests;

if ($tests === null) {
Expand All @@ -174,12 +174,14 @@ public static function provideTestClassCases(): iterable

/** @var SplFileInfo $file */
foreach ($finder as $file) {
$className = 'Tests';
$name = 'Tests';
if ($file->getRelativePath() !== '') {
$className .= '\\' . \str_replace('/', '\\', $file->getRelativePath());
$name .= '\\' . \str_replace('/', '\\', $file->getRelativePath());
}

$className .= '\\' . $file->getBasename('.php');
/** @var class-string $className */
$className = $name . '\\' . $file->getBasename('.php');

$testsArray[$className] = [$className];
}

Expand Down
6 changes: 4 additions & 2 deletions tests/Fixer/MultilinePromotedPropertiesFixerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
*
* @covers \PhpCsFixerCustomFixers\Fixer\MultilinePromotedPropertiesFixer
*
* @phpstan-import-type _InputConfig from \PhpCsFixer\Fixer\FunctionNotation\MultilinePromotedPropertiesFixer
*
* @requires PHP >= 8.0
*/
final class MultilinePromotedPropertiesFixerTest extends AbstractFixerTestCase
Expand All @@ -43,7 +45,7 @@ public function testIsRisky(): void
}

/**
* @param array<string, int> $configuration
* @param _InputConfig $configuration
*
* @dataProvider provideFixCases
*/
Expand All @@ -53,7 +55,7 @@ public function testFix(string $expected, ?string $input = null, array $configur
}

/**
* @return iterable<array{0: string, 1: null|string, 2?: array<string, bool|int>, 3?: WhitespacesFixerConfig}>
* @return iterable<array{0: string, 1: null|string, 2?: _InputConfig, 3?: WhitespacesFixerConfig}>
*/
public static function provideFixCases(): iterable
{
Expand Down
6 changes: 4 additions & 2 deletions tests/Fixer/PhpdocTagNoNamedArgumentsFixerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
* @internal
*
* @covers \PhpCsFixerCustomFixers\Fixer\PhpdocTagNoNamedArgumentsFixer
*
* @phpstan-import-type _InputConfig from \PhpCsFixerCustomFixers\Fixer\PhpdocTagNoNamedArgumentsFixer
*/
final class PhpdocTagNoNamedArgumentsFixerTest extends AbstractFixerTestCase
{
Expand Down Expand Up @@ -54,7 +56,7 @@ public function testSuccessorName(): void
}

/**
* @param array<string, int> $configuration
* @param _InputConfig $configuration
*
* @dataProvider provideFixCases
*/
Expand All @@ -64,7 +66,7 @@ public function testFix(string $expected, ?string $input = null, array $configur
}

/**
* @return iterable<string, array{0: string, 1?: null|string, 2?: array{path_prefix?: string, description?: string}, 3?: WhitespacesFixerConfig}>
* @return iterable<string, array{0: string, 1?: null|string, 2?: _InputConfig, 3?: WhitespacesFixerConfig}>
*/
public static function provideFixCases(): iterable
{
Expand Down
6 changes: 4 additions & 2 deletions tests/Fixer/PromotedConstructorPropertyFixerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
*
* @covers \PhpCsFixerCustomFixers\Fixer\PromotedConstructorPropertyFixer
*
* @phpstan-import-type _InputConfig from \PhpCsFixerCustomFixers\Fixer\PromotedConstructorPropertyFixer
*
* @requires PHP >= 8.0
*/
final class PromotedConstructorPropertyFixerTest extends AbstractFixerTestCase
Expand All @@ -33,7 +35,7 @@ public function testIsRisky(): void
}

/**
* @param array<string, list<string>> $configuration
* @param _InputConfig $configuration
*
* @dataProvider provideFixCases
*/
Expand All @@ -43,7 +45,7 @@ public function testFix(string $expected, ?string $input = null, array $configur
}

/**
* @return iterable<array{0: string, 1?: string}>
* @return iterable<array{0: string, 1?: string, 2?: _InputConfig}>
*/
public static function provideFixCases(): iterable
{
Expand Down