Refactor MysqliQueryDynamicReturnTypeExtension (#55)

Co-authored-by: Markus Staab <m.staab@complex-it.de>

Author: staabm

src/Extensions/MysqliQueryDynamicReturnTypeExtension.php

@@ -6,6 +6,7 @@
 
 use mysqli;
 use mysqli_result;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
@@ -62,22 +63,9 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
             return $defaultReturn;
         }
 
-        $queryReflection = new QueryReflection();
-        $queryString = $queryReflection->resolveQueryString($args[1]->value, $scope);
-        if (null === $queryString) {
-            return $defaultReturn;
-        }
-
-        $resultType = $queryReflection->getResultType($queryString, QueryReflector::FETCH_TYPE_ASSOC);
-        if ($resultType) {
-            if (QueryReflection::getRuntimeConfiguration()->throwsMysqliExceptions($this->phpVersion)) {
-                return new GenericObjectType(mysqli_result::class, [$resultType]);
-            }
-
-            return TypeCombinator::union(
-                new GenericObjectType(mysqli_result::class, [$resultType]),
-                new ConstantBooleanType(false),
-            );
+        $resultType = $this->inferResultType($args[1]->value, $scope);
+        if (null !== $resultType) {
+            return $resultType;
         }
 
         return $defaultReturn;
@@ -96,10 +84,20 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
             return $defaultReturn;
         }
 
+        $resultType = $this->inferResultType($args[0]->value, $scope);
+        if (null !== $resultType) {
+            return $resultType;
+        }
+
+        return $defaultReturn;
+    }
+
+    private function inferResultType(Expr $queryExpr, Scope $scope): ?Type
+    {
         $queryReflection = new QueryReflection();
-        $queryString = $queryReflection->resolveQueryString($args[0]->value, $scope);
+        $queryString = $queryReflection->resolveQueryString($queryExpr, $scope);
         if (null === $queryString) {
-            return $defaultReturn;
+            return null;
         }
 
         $resultType = $queryReflection->getResultType($queryString, QueryReflector::FETCH_TYPE_ASSOC);
@@ -114,6 +112,6 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
             );
         }
 
-        return $defaultReturn;
+        return null;
     }
 }