Fix findBy method reflection to accept a parameter and return the correct type

Author: sascha-egerer

src/Reflection/RepositoryFindByMethodReflection.php

@@ -3,23 +3,36 @@
 
 namespace SaschaEgerer\PhpstanTypo3\Reflection;
 
+use PHPStan\Broker\Broker;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
-use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
+use TYPO3\CMS\Core\Utility\ClassNamingUtility;
+use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
 
 class RepositoryFindByMethodReflection implements MethodReflection
 {
-
+    /**
+     * @var \PHPStan\Reflection\ClassReflection
+     */
     private $classReflection;
 
+    /**
+     * @var string
+     */
     private $name;
 
-    public function __construct(ClassReflection $classReflection, string $name)
+    /**
+     * @var \PHPStan\Broker\Broker
+     */
+    private $broker;
+
+    public function __construct(ClassReflection $classReflection, string $name, Broker $broker)
     {
         $this->classReflection = $classReflection;
         $this->name = $name;
+        $this->broker = $broker;
     }
 
     public function getDeclaringClass(): ClassReflection
@@ -52,9 +65,27 @@ public function getName(): string
         return $this->name;
     }
 
+    private function getPropertyName(): string
+    {
+        return lcfirst(substr($this->getName(), 6));
+    }
+
+    private function getModelName(): string
+    {
+        $className = $this->classReflection->getName();
+
+        return ClassNamingUtility::translateRepositoryNameToModelName($className);
+    }
+
     public function getParameters(): array
     {
-        return [];
+        $modelReflection = $this->broker->getClass($this->getModelName());
+
+        $type = $modelReflection->getNativeProperty($this->getPropertyName())->getType();
+
+        return [
+            new RepositoryFindByParameterReflection('arg', $type)
+        ];
     }
 
     public function isVariadic(): bool
@@ -64,6 +95,6 @@ public function isVariadic(): bool
 
     public function getReturnType(): Type
     {
-        return new ObjectType(ObjectStorage::class);
+        return new ObjectType(QueryResultInterface::class);
     }
 }

src/Reflection/RepositoryFindOneByParameterReflection.php renamed to src/Reflection/RepositoryFindByParameterReflection.php

@@ -8,7 +8,7 @@
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 
-class RepositoryFindOneByParameterReflection implements ParameterReflection
+class RepositoryFindByParameterReflection implements ParameterReflection
 {
     /**
      * @var string

src/Reflection/RepositoryFindOneByMethodReflection.php

@@ -83,7 +83,7 @@ public function getParameters(): array
         $type = $modelReflection->getNativeProperty($this->getPropertyName())->getType();
 
         return [
-            new RepositoryFindOneByParameterReflection('arg', $type)
+            new RepositoryFindByParameterReflection('arg', $type)
         ];
     }
 

src/Reflection/RepositoryMethodsClassReflectionExtension.php

@@ -36,7 +36,7 @@ public function getMethod(ClassReflection $classReflection, string $methodName):
         if (0 === strpos($methodName, 'findOneBy')) {
             $methodReflection = new RepositoryFindOneByMethodReflection($classReflection, $methodName, $this->broker);
         } else {
-            $methodReflection = new RepositoryFindByMethodReflection($classReflection, $methodName);
+            $methodReflection = new RepositoryFindByMethodReflection($classReflection, $methodName, $this->broker);
         }
 
         return $methodReflection;