support PDO->query() when no fetch-type given (#38)

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

Author: staabm

src/Extensions/PdoQueryDynamicReturnTypeExtension.php

@@ -42,23 +42,26 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
             new ConstantBooleanType(false)
         );
 
-        if (\count($args) < 2) {
+        if (\count($args) < 1) {
             return $defaultReturn;
         }
 
-        $fetchModeType = $scope->getType($args[1]->value);
-        if (!$fetchModeType instanceof ConstantIntegerType) {
-            return $defaultReturn;
-        }
+        $reflectionFetchType = QueryReflector::FETCH_TYPE_BOTH;
+        if (\count($args) >= 2) {
+            $fetchModeType = $scope->getType($args[1]->value);
+            if (!$fetchModeType instanceof ConstantIntegerType) {
+                return $defaultReturn;
+            }
 
-        if (PDO::FETCH_ASSOC === $fetchModeType->getValue()) {
-            $reflectionFetchType = QueryReflector::FETCH_TYPE_ASSOC;
-        } elseif (PDO::FETCH_NUM === $fetchModeType->getValue()) {
-            $reflectionFetchType = QueryReflector::FETCH_TYPE_NUMERIC;
-        } elseif (PDO::FETCH_BOTH === $fetchModeType->getValue()) {
-            $reflectionFetchType = QueryReflector::FETCH_TYPE_BOTH;
-        } else {
-            return $defaultReturn;
+            if (PDO::FETCH_ASSOC === $fetchModeType->getValue()) {
+                $reflectionFetchType = QueryReflector::FETCH_TYPE_ASSOC;
+            } elseif (PDO::FETCH_NUM === $fetchModeType->getValue()) {
+                $reflectionFetchType = QueryReflector::FETCH_TYPE_NUMERIC;
+            } elseif (PDO::FETCH_BOTH === $fetchModeType->getValue()) {
+                $reflectionFetchType = QueryReflector::FETCH_TYPE_BOTH;
+            } else {
+                return $defaultReturn;
+            }
         }
 
         $queryReflection = new QueryReflection();

tests/data/pdo-fetch-types.php

@@ -7,27 +7,28 @@
 
 class Foo
 {
-	public function supportedFetchTypes(PDO $pdo)
-	{
-		$stmt = $pdo->query('SELECT email, adaid FROM ada', PDO::FETCH_NUM);
-		assertType('PDOStatement<array{string, int<0, 4294967295>}>', $stmt);
-
-		$stmt = $pdo->query('SELECT email, adaid FROM ada', PDO::FETCH_ASSOC);
-		assertType('PDOStatement<array{email: string, adaid: int<0, 4294967295>}>', $stmt);
-
-		$stmt = $pdo->query('SELECT email, adaid FROM ada', PDO::FETCH_BOTH);
-		assertType('PDOStatement<array{email: string, 0: string, adaid: int<0, 4294967295>, 1: int<0, 4294967295>}>', $stmt);
-	}
-
-	public function unsupportedFetchTypes(PDO $pdo)
-	{
-		$stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada');
-		assertType('PDOStatement<array>|false', $stmt);
-
-		$stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada', PDO::FETCH_COLUMN);
-		assertType('PDOStatement<array>|false', $stmt);
-
-		$stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada', PDO::FETCH_OBJ);
-		assertType('PDOStatement<array>|false', $stmt);
-	}
+    public function supportedFetchTypes(PDO $pdo)
+    {
+        // default fetch-type is BOTH
+        $stmt = $pdo->query('SELECT email, adaid FROM ada');
+        assertType('PDOStatement<array{email: string, 0: string, adaid: int<0, 4294967295>, 1: int<0, 4294967295>}>', $stmt);
+
+        $stmt = $pdo->query('SELECT email, adaid FROM ada', PDO::FETCH_NUM);
+        assertType('PDOStatement<array{string, int<0, 4294967295>}>', $stmt);
+
+        $stmt = $pdo->query('SELECT email, adaid FROM ada', PDO::FETCH_ASSOC);
+        assertType('PDOStatement<array{email: string, adaid: int<0, 4294967295>}>', $stmt);
+
+        $stmt = $pdo->query('SELECT email, adaid FROM ada', PDO::FETCH_BOTH);
+        assertType('PDOStatement<array{email: string, 0: string, adaid: int<0, 4294967295>, 1: int<0, 4294967295>}>', $stmt);
+    }
+
+    public function unsupportedFetchTypes(PDO $pdo)
+    {
+        $stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada', PDO::FETCH_COLUMN);
+        assertType('PDOStatement<array>|false', $stmt);
+
+        $stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada', PDO::FETCH_OBJ);
+        assertType('PDOStatement<array>|false', $stmt);
+    }
 }