Add MockObjectArgCreateStubToCreateMockRector

config/sets/phpunit-mock-to-stub.php

@@ -6,6 +6,7 @@
 use Rector\PHPUnit\CodeQuality\Rector\Class_\AddIntersectionVarToMockObjectPropertyRector;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\AddStubIntersectionVarToStubPropertyRector;
 use Rector\PHPUnit\CodeQuality\Rector\ClassMethod\BareCreateMockAssignToDirectUseRector;
+use Rector\PHPUnit\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector;
 use Rector\PHPUnit\PHPUnit120\Rector\CallLike\CreateStubInCoalesceArgRector;
 use Rector\PHPUnit\PHPUnit120\Rector\CallLike\CreateStubOverCreateMockArgRector;
 use Rector\PHPUnit\PHPUnit120\Rector\Class_\PropertyCreateMockToCreateStubRector;
@@ -23,5 +24,8 @@
         AddIntersectionVarToMockObjectPropertyRector::class,
         AddStubIntersectionVarToStubPropertyRector::class,
         BareCreateMockAssignToDirectUseRector::class,
+
+        // mocks back over stubs, where mock object is required
+        MockObjectArgCreateStubToCreateMockRector::class,
     ]);
 };

rules-tests/AnnotationsToAttributes/Rector/ClassMethod/DataProviderAnnotationToAttributeRector/Fixture/in_test_trait.php.inc

@@ -0,0 +1,29 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\AnnotationsToAttributes\Rector\ClassMethod\DataProviderAnnotationToAttributeRector\Fixture;
+
+trait SomeTestTrait
+{
+    /**
+     * @dataProvider someMethod()
+     */
+    public function test(): void
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\PHPUnit\Tests\AnnotationsToAttributes\Rector\ClassMethod\DataProviderAnnotationToAttributeRector\Fixture;
+
+trait SomeTestTrait
+{
+    #[\PHPUnit\Framework\Attributes\DataProvider('someMethod')]
+    public function test(): void
+    {
+    }
+}
+
+?>

rules-tests/AnnotationsToAttributes/Rector/ClassMethod/DataProviderAnnotationToAttributeRector/Fixture/skip_non_public_trait_method.php.inc

@@ -0,0 +1,13 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\AnnotationsToAttributes\Rector\ClassMethod\DataProviderAnnotationToAttributeRector\Fixture;
+
+trait SkipNonPublicTraitMethod
+{
+    /**
+     * @dataProvider someMethod()
+     */
+    protected function test(): void
+    {
+    }
+}

rules-tests/AnnotationsToAttributes/Rector/ClassMethod/DataProviderAnnotationToAttributeRector/Fixture/skip_static_trait_method.php.inc

@@ -0,0 +1,13 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\AnnotationsToAttributes\Rector\ClassMethod\DataProviderAnnotationToAttributeRector\Fixture;
+
+trait SkipStaticTraitMethod
+{
+    /**
+     * @dataProvider someMethod()
+     */
+    public static function test(): void
+    {
+    }
+}

rules-tests/PHPUnit110/Rector/ClassMethod/MockObjectArgCreateStubToCreateMockRector/Fixture/fixture.php.inc

@@ -0,0 +1,51 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector\Fixture;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Rector\PHPUnit\Tests\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector\Source\SomeUser;
+
+final class PassedToMockObjectParam extends TestCase
+{
+    public function test()
+    {
+        $user = $this->createStub(SomeUser::class);
+        $this->prepareUserMock($user);
+    }
+
+    private function prepareUserMock(MockObject $user): void
+    {
+        $user->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\PHPUnit\Tests\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector\Fixture;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Rector\PHPUnit\Tests\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector\Source\SomeUser;
+
+final class PassedToMockObjectParam extends TestCase
+{
+    public function test()
+    {
+        $user = $this->createMock(SomeUser::class);
+        $this->prepareUserMock($user);
+    }
+
+    private function prepareUserMock(MockObject $user): void
+    {
+        $user->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+    }
+}
+
+?>

rules-tests/PHPUnit110/Rector/ClassMethod/MockObjectArgCreateStubToCreateMockRector/Fixture/intersection_docblock_param.php.inc

@@ -0,0 +1,57 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector\Fixture;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Rector\PHPUnit\Tests\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector\Source\SomeUser;
+
+final class IntersectionDocblockParam extends TestCase
+{
+    public function test()
+    {
+        $user = $this->createStub(SomeUser::class);
+        $this->prepareCommonMocks('some_event', $user);
+    }
+
+    /**
+     * @param MockObject&SomeUser $user
+     */
+    private function prepareCommonMocks(string $event, MockObject $user): void
+    {
+        $user->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\PHPUnit\Tests\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector\Fixture;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Rector\PHPUnit\Tests\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector\Source\SomeUser;
+
+final class IntersectionDocblockParam extends TestCase
+{
+    public function test()
+    {
+        $user = $this->createMock(SomeUser::class);
+        $this->prepareCommonMocks('some_event', $user);
+    }
+
+    /**
+     * @param MockObject&SomeUser $user
+     */
+    private function prepareCommonMocks(string $event, MockObject $user): void
+    {
+        $user->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+    }
+}
+
+?>

rules-tests/PHPUnit110/Rector/ClassMethod/MockObjectArgCreateStubToCreateMockRector/Fixture/named_arg.php.inc

@@ -0,0 +1,49 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector\Fixture;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Rector\PHPUnit\Tests\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector\Source\SomeUser;
+
+final class NamedArg extends TestCase
+{
+    public function test()
+    {
+        $user = $this->createStub(SomeUser::class);
+        $this->prepareUserMock(user: $user);
+    }
+
+    private function prepareUserMock(MockObject $user): void
+    {
+        $user->expects($this->once())
+            ->method('getId');
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\PHPUnit\Tests\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector\Fixture;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Rector\PHPUnit\Tests\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector\Source\SomeUser;
+
+final class NamedArg extends TestCase
+{
+    public function test()
+    {
+        $user = $this->createMock(SomeUser::class);
+        $this->prepareUserMock(user: $user);
+    }
+
+    private function prepareUserMock(MockObject $user): void
+    {
+        $user->expects($this->once())
+            ->method('getId');
+    }
+}
+
+?>

rules-tests/PHPUnit110/Rector/ClassMethod/MockObjectArgCreateStubToCreateMockRector/Fixture/skip_plain_param_type.php.inc

@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+use Rector\PHPUnit\Tests\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector\Source\SomeUser;
+
+final class SkipPlainParamType extends TestCase
+{
+    public function test()
+    {
+        $user = $this->createStub(SomeUser::class);
+        $this->useUser($user);
+    }
+
+    private function useUser(SomeUser $user): void
+    {
+        $user->getId();
+    }
+}

rules-tests/PHPUnit110/Rector/ClassMethod/MockObjectArgCreateStubToCreateMockRector/Fixture/skip_stub_only_usage.php.inc

@@ -0,0 +1,17 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+use Rector\PHPUnit\Tests\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector\Source\SomeUser;
+
+final class SkipStubOnlyUsage extends TestCase
+{
+    public function test()
+    {
+        $user = $this->createStub(SomeUser::class);
+        $user->method('getId')->willReturn(1);
+
+        $this->assertSame(1, $user->getId());
+    }
+}

rules-tests/PHPUnit110/Rector/ClassMethod/MockObjectArgCreateStubToCreateMockRector/MockObjectArgCreateStubToCreateMockRectorTest.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPUnit\Tests\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector;
+
+use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+
+final class MockObjectArgCreateStubToCreateMockRectorTest extends AbstractRectorTestCase
+{
+    #[DataProvider('provideData')]
+    public function test(string $filePath): void
+    {
+        $this->doTestFile($filePath);
+    }
+
+    public static function provideData(): Iterator
+    {
+        return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}

rules-tests/PHPUnit110/Rector/ClassMethod/MockObjectArgCreateStubToCreateMockRector/Source/SomeUser.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPUnit\Tests\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector\Source;
+
+final class SomeUser
+{
+    public function getId(): int
+    {
+        return 1;
+    }
+}

rules-tests/PHPUnit110/Rector/ClassMethod/MockObjectArgCreateStubToCreateMockRector/config/configured_rule.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\PHPUnit\PHPUnit110\Rector\ClassMethod\MockObjectArgCreateStubToCreateMockRector;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(MockObjectArgCreateStubToCreateMockRector::class);
+};

rules/AnnotationsToAttributes/Rector/ClassMethod/DataProviderAnnotationToAttributeRector.php

@@ -9,7 +9,6 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PHPStan\PhpDocParser\Ast\PhpDoc\GenericTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
-use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
@@ -20,7 +19,6 @@
 use Rector\PHPUnit\Enum\PHPUnitAttribute;
 use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
 use Rector\Rector\AbstractRector;
-use Rector\Reflection\ReflectionResolver;
 use Rector\ValueObject\PhpVersion;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -35,7 +33,6 @@ public function __construct(
         private readonly TestsNodeAnalyzer $testsNodeAnalyzer,
         private readonly PhpAttributeGroupFactory $phpAttributeGroupFactory,
         private readonly PhpDocTagRemover $phpDocTagRemover,
-        private readonly ReflectionResolver $reflectionResolver,
         private readonly DocBlockUpdater $docBlockUpdater,
         private readonly PhpDocInfoFactory $phpDocInfoFactory,
         private readonly ReflectionProvider $reflectionProvider
@@ -119,15 +116,6 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        $classReflection = $this->reflectionResolver->resolveClassReflection($node);
-        if (! $classReflection instanceof ClassReflection) {
-            return null;
-        }
-
-        if (! $classReflection->isClass()) {
-            return null;
-        }
-
         foreach ($desiredTagValueNodes as $desiredTagValueNode) {
             if (! $desiredTagValueNode->value instanceof GenericTagValueNode && ! $desiredTagValueNode->value instanceof DoctrineAnnotationTagValueNode) {
                 continue;