diff --git a/rules/Php74/NodeAnalyzer/ClosureArrowFunctionAnalyzer.php b/rules/Php74/NodeAnalyzer/ClosureArrowFunctionAnalyzer.php index c1687c5d592..e0b111ca9b0 100644 --- a/rules/Php74/NodeAnalyzer/ClosureArrowFunctionAnalyzer.php +++ b/rules/Php74/NodeAnalyzer/ClosureArrowFunctionAnalyzer.php @@ -55,7 +55,7 @@ public function matchArrowFunctionExpr(Closure $closure): ?Expr return null; } - if ($this->shouldSkipMoreSpecificTypeWithVarDoc($return, $return->expr)) { + if ($this->shouldSkipMoreSpecificTypeWithVarDoc($return)) { return null; } @@ -92,7 +92,7 @@ function (Node $node) use ($variables): bool { * Ensure @var doc usage to be skipped, as arrow functions do not support * inline @var annotations for type narrowing (e.g. generic types like Builder) */ - private function shouldSkipMoreSpecificTypeWithVarDoc(Return_ $return, Expr $expr): bool + private function shouldSkipMoreSpecificTypeWithVarDoc(Return_ $return): bool { $phpDocInfo = $this->phpDocInfoFactory->createFromNode($return); diff --git a/src/VersionBonding/ComposerPackageConstraintFilter.php b/src/VersionBonding/ComposerPackageConstraintFilter.php index 892b4e8b1ee..54bb124b5ab 100644 --- a/src/VersionBonding/ComposerPackageConstraintFilter.php +++ b/src/VersionBonding/ComposerPackageConstraintFilter.php @@ -9,6 +9,9 @@ use Rector\Contract\Rector\RectorInterface; use Rector\VersionBonding\Contract\ComposerPackageConstraintInterface; +/** + * @see \Rector\Tests\VersionBonding\ComposerPackageConstraintFilterTest + */ final readonly class ComposerPackageConstraintFilter { public function __construct( diff --git a/src/VersionBonding/PhpVersionedFilter.php b/src/VersionBonding/PhpVersionedFilter.php index 0546ec82d77..9bd904408de 100644 --- a/src/VersionBonding/PhpVersionedFilter.php +++ b/src/VersionBonding/PhpVersionedFilter.php @@ -10,6 +10,9 @@ use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Rector\VersionBonding\Contract\RelatedPolyfillInterface; +/** + * @see \Rector\Tests\VersionBonding\PhpVersionedFilterTest + */ final readonly class PhpVersionedFilter { public function __construct( diff --git a/tests/VersionBonding/ComposerPackageConstraintFilterTest.php b/tests/VersionBonding/ComposerPackageConstraintFilterTest.php index c9cf6685523..c762fa64e7b 100644 --- a/tests/VersionBonding/ComposerPackageConstraintFilterTest.php +++ b/tests/VersionBonding/ComposerPackageConstraintFilterTest.php @@ -23,51 +23,51 @@ protected function setUp(): void public function testRectorWithoutInterfaceIsIncluded(): void { - $rector = new NoInterfaceRector(); - $filtered = $this->composerPackageConstraintFilter->filter([$rector]); + $noInterfaceRector = new NoInterfaceRector(); + $filtered = $this->composerPackageConstraintFilter->filter([$noInterfaceRector]); $this->assertCount(1, $filtered); - $this->assertSame($rector, $filtered[0]); + $this->assertSame($noInterfaceRector, $filtered[0]); } public function testRectorWithSatisfiedConstraintIsIncluded(): void { - $rector = new ComposerPackageConstraintRector('nikic/php-parser', '>=4.0.0'); - $filtered = $this->composerPackageConstraintFilter->filter([$rector]); + $composerPackageConstraintRector = new ComposerPackageConstraintRector('nikic/php-parser', '>=4.0.0'); + $filtered = $this->composerPackageConstraintFilter->filter([$composerPackageConstraintRector]); $this->assertCount(1, $filtered); - $this->assertSame($rector, $filtered[0]); + $this->assertSame($composerPackageConstraintRector, $filtered[0]); } public function testRectorWithUnsatisfiedConstraintIsExcluded(): void { - $rector = new ComposerPackageConstraintRector('nikic/php-parser', '>=999.0.0'); - $filtered = $this->composerPackageConstraintFilter->filter([$rector]); + $composerPackageConstraintRector = new ComposerPackageConstraintRector('nikic/php-parser', '>=999.0.0'); + $filtered = $this->composerPackageConstraintFilter->filter([$composerPackageConstraintRector]); $this->assertCount(0, $filtered); } public function testRectorWithMissingPackageIsExcluded(): void { - $rector = new ComposerPackageConstraintRector('non-existent/package', '>=1.0.0'); - $filtered = $this->composerPackageConstraintFilter->filter([$rector]); + $composerPackageConstraintRector = new ComposerPackageConstraintRector('non-existent/package', '>=1.0.0'); + $filtered = $this->composerPackageConstraintFilter->filter([$composerPackageConstraintRector]); $this->assertCount(0, $filtered); } public function testRectorWithCaretConstraint(): void { - $rector = new ComposerPackageConstraintRector('nikic/php-parser', '^5.0'); - $filtered = $this->composerPackageConstraintFilter->filter([$rector]); + $composerPackageConstraintRector = new ComposerPackageConstraintRector('nikic/php-parser', '^5.0'); + $filtered = $this->composerPackageConstraintFilter->filter([$composerPackageConstraintRector]); $this->assertCount(1, $filtered); - $this->assertSame($rector, $filtered[0]); + $this->assertSame($composerPackageConstraintRector, $filtered[0]); } public function testRectorWithLessThanConstraintExcludesNewerVersions(): void { - $rector = new ComposerPackageConstraintRector('nikic/php-parser', '<1.0.0'); - $filtered = $this->composerPackageConstraintFilter->filter([$rector]); + $composerPackageConstraintRector = new ComposerPackageConstraintRector('nikic/php-parser', '<1.0.0'); + $filtered = $this->composerPackageConstraintFilter->filter([$composerPackageConstraintRector]); $this->assertCount(0, $filtered); } diff --git a/tests/VersionBonding/PhpVersionedFilterTest.php b/tests/VersionBonding/PhpVersionedFilterTest.php index 9d5d90346ea..196a346a203 100644 --- a/tests/VersionBonding/PhpVersionedFilterTest.php +++ b/tests/VersionBonding/PhpVersionedFilterTest.php @@ -24,10 +24,10 @@ protected function setUp(): void public function testRectorWithoutInterfaceIsIncluded(): void { - $rector = new NoInterfaceRector(); - $filtered = $this->phpVersionedFilter->filter([$rector]); + $noInterfaceRector = new NoInterfaceRector(); + $filtered = $this->phpVersionedFilter->filter([$noInterfaceRector]); $this->assertCount(1, $filtered); - $this->assertSame($rector, $filtered[0]); + $this->assertSame($noInterfaceRector, $filtered[0]); } }