simplify doctrine query extension (#190)

Co-authored-by: Markus Staab <[email protected]>

Author: staabm

config/extensions.neon

@@ -1,6 +1,6 @@
 services:
     -
-        class: staabm\PHPStanDba\Extensions\DoctrineConnectionDynamicReturnTypeExtension
+        class: staabm\PHPStanDba\Extensions\DoctrineConnectionQueryDynamicReturnTypeExtension
         tags:
         	- phpstan.broker.dynamicMethodReturnTypeExtension
 

src/Extensions/DoctrineConnectionDynamicReturnTypeExtension.php renamed to src/Extensions/DoctrineConnectionQueryDynamicReturnTypeExtension.php

@@ -8,7 +8,6 @@
 use Composer\Semver\VersionParser;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Result;
-use Doctrine\DBAL\Statement;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
@@ -21,24 +20,16 @@
 use staabm\PHPStanDba\QueryReflection\QueryReflection;
 use staabm\PHPStanDba\QueryReflection\QueryReflector;
 
-final class DoctrineConnectionDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
+final class DoctrineConnectionQueryDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
-    /**
-     * @var array<string, class-string> return types of Connection methods in doctrine 3.x
-     */
-    private $resultMap = [
-        'query' => Result::class,
-        //'prepare' => Statement::class,
-    ];
-
     public function getClass(): string
     {
         return Connection::class;
     }
 
     public function isMethodSupported(MethodReflection $methodReflection): bool
     {
-        return \in_array(strtolower($methodReflection->getName()), ['query'/*, 'prepare'*/], true);
+        return \in_array(strtolower($methodReflection->getName()), ['query'], true);
     }
 
     public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
@@ -63,26 +54,25 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
             return $defaultReturn;
         }
 
-        $resultType = $this->inferType($methodReflection, $args[0]->value, $scope);
+        $resultType = $this->inferType($args[0]->value, $scope);
         if (null !== $resultType) {
             return $resultType;
         }
 
         return $defaultReturn;
     }
 
-    private function inferType(MethodReflection $methodReflection, Expr $queryExpr, Scope $scope): ?Type
+    private function inferType(Expr $queryExpr, Scope $scope): ?Type
     {
         $queryReflection = new QueryReflection();
         $queryString = $queryReflection->resolveQueryString($queryExpr, $scope);
         if (null === $queryString) {
             return null;
         }
 
-        $genericMainType = $this->resultMap[strtolower($methodReflection->getName())];
         $resultType = $queryReflection->getResultType($queryString, QueryReflector::FETCH_TYPE_BOTH);
         if ($resultType) {
-            return new GenericObjectType($genericMainType, [$resultType]);
+            return new GenericObjectType(Result::class, [$resultType]);
         }
 
         return null;