[ci-review] Rector Rectify

sabbelasichon · Jan 4, 2024 · f3de441 · f3de441
1 parent e7f4e60
commit f3de441
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/src/Rector/v12/v3/typo3/MigrateMagicRepositoryMethodsRector.php b/src/Rector/v12/v3/typo3/MigrateMagicRepositoryMethodsRector.php
@@ -9,7 +9,6 @@
 use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Scalar\String_;
-use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\ObjectType;
 use Rector\Core\Rector\AbstractRector;
@@ -51,16 +50,6 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        // TODO: check if method already exists in class
-
-        $methodReflection = $this->reflectionResolver->resolveMethodReflectionFromMethodCall($node);
-        if ($methodReflection instanceof MethodReflection) {
-            $declaringClass = $methodReflection->getDeclaringClass();
-            if ($declaringClass instanceof ClassReflection) {
-                $classOfClassMethod = $declaringClass->getName();
-            }
-        }
-
         $methodName = $this->getName($node->name);
 
         if ($methodName === null) {
@@ -74,10 +63,15 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        $methodReflection = $this->reflectionResolver->resolveMethodReflectionFromMethodCall($node);
+        # Class reflection only works when the method exists - thus we don't migrate if it succeeds/is not null
+        if ($methodReflection !== null) {
+            return null;
+        }
+
         $propertyName = '';
         $newMethodCall = '';
 
-        // TODO: make this better somehow?
         if (\str_starts_with($methodName, 'findBy')) {
             $propertyName = str_replace('findBy', '', $methodName);
             $newMethodCall = 'findBy';

diff --git a/stubs/TYPO3/CMS/Extbase/Persistence/ExampleRepository.php b/stubs/TYPO3/CMS/Extbase/Persistence/ExampleRepository.php
@@ -6,5 +6,6 @@
 
 class ExampleRepository extends Repository
 {
+    public function findByMethodExists(string $random): void {}
 
 }
diff --git a/tests/Rector/v12/v3/typo3/MigrateMagicRepositoryMethodsRector/Fixture/fixture.php.inc b/tests/Rector/v12/v3/typo3/MigrateMagicRepositoryMethodsRector/Fixture/fixture.php.inc
@@ -4,16 +4,17 @@ namespace Ssch\TYPO3Rector\Tests\Rector\v12\v3\typo3\MigrateMagicRepositoryMetho
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Persistence\ExampleRepository;
-use TYPO3\CMS\Extbase\Persistence\Repository;
 
-$exampleRepo = GeneralUtility::makeInstance(Repository::class);
+$exampleRepo = GeneralUtility::makeInstance(ExampleRepository::class);
 $exampleRepo->findByFoo('bar');
 $exampleRepo->findByFooBar('bar');
 $bar = 'bar';
 $exampleRepo->findByFoo($bar);
 $exampleRepo->findOneByFoo('bar');
 $exampleRepo->countByFoo('bar');
 
+$exampleRepo->findByMethodExists('bar');
+
 ?>
 -----
 <?php
@@ -22,14 +23,15 @@ namespace Ssch\TYPO3Rector\Tests\Rector\v12\v3\typo3\MigrateMagicRepositoryMetho
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Persistence\ExampleRepository;
-use TYPO3\CMS\Extbase\Persistence\Repository;
 
-$exampleRepo = GeneralUtility::makeInstance(Repository::class);
+$exampleRepo = GeneralUtility::makeInstance(ExampleRepository::class);
 $exampleRepo->findBy(['foo' => 'bar']);
 $exampleRepo->findBy(['fooBar' => 'bar']);
 $bar = 'bar';
 $exampleRepo->findBy(['foo' => $bar]);
 $exampleRepo->findOneBy(['foo' => 'bar']);
 $exampleRepo->count(['foo' => 'bar']);
 
+$exampleRepo->findByMethodExists('bar');
+
 ?>