diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/BareCreateMockAssignToDirectUseRector/Fixture/multiple_uses_as_no_connection.php.inc b/rules-tests/CodeQuality/Rector/ClassMethod/BareCreateMockAssignToDirectUseRector/Fixture/multiple_uses_as_no_connection.php.inc deleted file mode 100644 index 2734ca02..00000000 --- a/rules-tests/CodeQuality/Rector/ClassMethod/BareCreateMockAssignToDirectUseRector/Fixture/multiple_uses_as_no_connection.php.inc +++ /dev/null @@ -1,51 +0,0 @@ -createMock(\Rector\PHPUnit\Tests\CodeQuality\Rector\ClassMethod\BareCreateMockAssignToDirectUseRector\Source\AnotherClass::class); - - $this->useMock($someMock); - $this->useMockAgain($someMock); - } - - private function useMock($someMock) - { - } - - private function useMockAgain($someMock) - { - } -} - -?> ------ -useMock($this->createMock(\Rector\PHPUnit\Tests\CodeQuality\Rector\ClassMethod\BareCreateMockAssignToDirectUseRector\Source\AnotherClass::class)); - $this->useMockAgain($this->createMock(\Rector\PHPUnit\Tests\CodeQuality\Rector\ClassMethod\BareCreateMockAssignToDirectUseRector\Source\AnotherClass::class)); - } - - private function useMock($someMock) - { - } - - private function useMockAgain($someMock) - { - } -} - -?> diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/BareCreateMockAssignToDirectUseRector/Fixture/skip_multiple_uses_as_arg.php.inc b/rules-tests/CodeQuality/Rector/ClassMethod/BareCreateMockAssignToDirectUseRector/Fixture/skip_multiple_uses_as_arg.php.inc new file mode 100644 index 00000000..a10fa864 --- /dev/null +++ b/rules-tests/CodeQuality/Rector/ClassMethod/BareCreateMockAssignToDirectUseRector/Fixture/skip_multiple_uses_as_arg.php.inc @@ -0,0 +1,26 @@ +createMock(\Rector\PHPUnit\Tests\CodeQuality\Rector\ClassMethod\BareCreateMockAssignToDirectUseRector\Source\AnotherClass::class); + + // behaviour can already changed on first use + $this->useMock($someMock); + $this->useMockAgain($someMock); + } + + private function useMock($someMock) + { + $someMock->method('someMethod'); + } + + private function useMockAgain($someMock) + { + } +} diff --git a/rules/AnnotationsToAttributes/Rector/ClassMethod/TestWithAnnotationToAttributeRector.php b/rules/AnnotationsToAttributes/Rector/ClassMethod/TestWithAnnotationToAttributeRector.php index 30f59c69..763cfda7 100644 --- a/rules/AnnotationsToAttributes/Rector/ClassMethod/TestWithAnnotationToAttributeRector.php +++ b/rules/AnnotationsToAttributes/Rector/ClassMethod/TestWithAnnotationToAttributeRector.php @@ -129,7 +129,6 @@ public function refactor(Node $node): ?Node // test from doc blocks $this->phpDocTagRemover->removeTagValueFromNode($phpDocInfo, $testWithPhpDocTagNode); - /** @var GenericTagValueNode $genericTagValueNode */ $genericTagValueNode = $testWithPhpDocTagNode->value; $testWithItems = explode("\n", trim($genericTagValueNode->value)); diff --git a/rules/CodeQuality/Rector/ClassMethod/BareCreateMockAssignToDirectUseRector.php b/rules/CodeQuality/Rector/ClassMethod/BareCreateMockAssignToDirectUseRector.php index e19862b1..110e50e9 100644 --- a/rules/CodeQuality/Rector/ClassMethod/BareCreateMockAssignToDirectUseRector.php +++ b/rules/CodeQuality/Rector/ClassMethod/BareCreateMockAssignToDirectUseRector.php @@ -227,8 +227,7 @@ private function isUsedMoreOftenThanInCallLikeArgs(ClassMethod|Foreach_ $stmtsAw } } - // not suitable for direct replacing - return (count($foundVariables) - 1) > ($callLikeVariableUseCount); + return $callLikeVariableUseCount > 1 || (count($foundVariables) - 1) > $callLikeVariableUseCount; } /** diff --git a/rules/CodeQuality/Rector/Class_/AddSeeTestAnnotationRector.php b/rules/CodeQuality/Rector/Class_/AddSeeTestAnnotationRector.php index 2e8708b6..43306e35 100644 --- a/rules/CodeQuality/Rector/Class_/AddSeeTestAnnotationRector.php +++ b/rules/CodeQuality/Rector/Class_/AddSeeTestAnnotationRector.php @@ -134,7 +134,6 @@ private function shouldSkipClass(Class_ $class): bool continue; } - /** @var GenericTagValueNode $genericTagValueNode */ $genericTagValueNode = $seePhpDocTagNode->value; $seeTagClass = ltrim($genericTagValueNode->value, '\\'); diff --git a/rules/PHPUnit120/Rector/ClassMethod/ExpressionCreateMockToCreateStubRector.php b/rules/PHPUnit120/Rector/ClassMethod/ExpressionCreateMockToCreateStubRector.php index 5c1df1b1..acf54efc 100644 --- a/rules/PHPUnit120/Rector/ClassMethod/ExpressionCreateMockToCreateStubRector.php +++ b/rules/PHPUnit120/Rector/ClassMethod/ExpressionCreateMockToCreateStubRector.php @@ -106,7 +106,6 @@ public function refactor(Node $node): ?ClassMethod continue; } - /** @var Assign $assign */ $assign = $stmt->expr; if (! $assign->var instanceof Variable) {