use proper default return value (#48)

staabm · clxmstaab · web-flow · commit eb654fd7f59b · 2022-01-09T11:44:41.000Z
Co-authored-by: Markus Staab &lt;m.staab@complex-it.de&gt;
diff --git a/src/Extensions/PdoPrepareDynamicReturnTypeExtension.php b/src/Extensions/PdoPrepareDynamicReturnTypeExtension.php
@@ -10,11 +10,10 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Type\ArrayType;
+use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\Generic\GenericObjectType;
-use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use staabm\PHPStanDba\QueryReflection\QueryReflection;
@@ -45,12 +44,7 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
     public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
     {
         $args = $methodCall->getArgs();
-        $mixed = new MixedType(true);
-
-        $defaultReturn = TypeCombinator::union(
-            new GenericObjectType(PDOStatement::class, [new ArrayType($mixed, $mixed)]),
-            new ConstantBooleanType(false)
-        );
+        $defaultReturn = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
 
         if (QueryReflection::getRuntimeConfiguration()->throwsPdoExceptions($this->phpVersion)) {
             $defaultReturn = TypeCombinator::remove($defaultReturn, new ConstantBooleanType(false));
diff --git a/src/Extensions/PdoQueryDynamicReturnTypeExtension.php b/src/Extensions/PdoQueryDynamicReturnTypeExtension.php
@@ -10,12 +10,11 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Type\ArrayType;
+use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\Generic\GenericObjectType;
-use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use staabm\PHPStanDba\QueryReflection\QueryReflection;
@@ -46,12 +45,11 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
     public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
     {
         $args = $methodCall->getArgs();
-        $mixed = new MixedType(true);
-
-        $defaultReturn = TypeCombinator::union(
-            new GenericObjectType(PDOStatement::class, [new ArrayType($mixed, $mixed)]),
-            new ConstantBooleanType(false)
-        );
+        $defaultReturn = ParametersAcceptorSelector::selectFromArgs(
+            $scope,
+            $methodCall->getArgs(),
+            $methodReflection->getVariants(),
+        )->getReturnType();
 
         if (QueryReflection::getRuntimeConfiguration()->throwsPdoExceptions($this->phpVersion)) {
             $defaultReturn = TypeCombinator::remove($defaultReturn, new ConstantBooleanType(false));
diff --git a/tests/data/pdo-fetch-types.php b/tests/data/pdo-fetch-types.php
@@ -26,9 +26,9 @@ public function supportedFetchTypes(PDO $pdo)
     public function unsupportedFetchTypes(PDO $pdo)
     {
         $stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada', PDO::FETCH_COLUMN);
-        assertType('PDOStatement<array>', $stmt);
+        assertType('PDOStatement', $stmt);
 
         $stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada', PDO::FETCH_OBJ);
-        assertType('PDOStatement<array>', $stmt);
+        assertType('PDOStatement', $stmt);
     }
 }
diff --git a/tests/data/pdo-quote.php b/tests/data/pdo-quote.php
@@ -72,9 +72,9 @@ public function quotedArguments(PDO $pdo, int $i, float $f, $n, string $s, $nonE
 
         // when quote() cannot return a numeric-string, we can't infer the precise result-type
         $stmt = $pdo->query('SELECT email, adaid FROM ada WHERE adaid='.$pdo->quote($s), PDO::FETCH_ASSOC);
-        assertType('PDOStatement<array>', $stmt);
+        assertType('PDOStatement', $stmt);
 
         $stmt = $pdo->query('SELECT email, adaid FROM ada WHERE adaid='.$pdo->quote($nonE), PDO::FETCH_ASSOC);
-        assertType('PDOStatement<array>', $stmt);
+        assertType('PDOStatement', $stmt);
     }
 }
diff --git a/tests/data/pdo.php b/tests/data/pdo.php
@@ -42,7 +42,7 @@ public function queryWithNullColumn(PDO $pdo)
     public function syntaxError(PDO $pdo)
     {
         $stmt = $pdo->query('SELECT email adaid WHERE gesperrt freigabe1u1 FROM ada', PDO::FETCH_ASSOC);
-        assertType('PDOStatement<array>', $stmt);
+        assertType('PDOStatement', $stmt);
     }
 
     /**
@@ -76,39 +76,39 @@ public function concatedQuerySelected(PDO $pdo, int $int, string $string, float
         // ---- queries, for which we cannot infer the return type
 
         $stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE '.$string, PDO::FETCH_ASSOC);
-        assertType('PDOStatement<array>', $stmt);
+        assertType('PDOStatement', $stmt);
 
         $stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE '.$nonEmptyString, PDO::FETCH_ASSOC);
-        assertType('PDOStatement<array>', $stmt);
+        assertType('PDOStatement', $stmt);
 
         $stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE '.$mixed, PDO::FETCH_ASSOC);
-        assertType('PDOStatement<array>', $stmt);
+        assertType('PDOStatement', $stmt);
     }
 
     public function dynamicQuery(PDO $pdo, string $query)
     {
         $stmt = $pdo->query($query, PDO::FETCH_ASSOC);
-        assertType('PDOStatement<array>', $stmt);
+        assertType('PDOStatement', $stmt);
     }
 
     public function insertQuery(PDO $pdo)
     {
         $query = "INSERT INTO ada SET email='test@complex-it.de'";
         $stmt = $pdo->query($query, PDO::FETCH_ASSOC);
-        assertType('PDOStatement<array>', $stmt);
+        assertType('PDOStatement', $stmt);
     }
 
     public function replaceQuery(PDO $pdo)
     {
         $query = "REPLACE INTO ada SET email='test@complex-it.de'";
         $stmt = $pdo->query($query, PDO::FETCH_ASSOC);
-        assertType('PDOStatement<array>', $stmt);
+        assertType('PDOStatement', $stmt);
     }
 
     public function updateQuery(PDO $pdo)
     {
         $query = "UPDATE ada SET email='test@complex-it.de' where adaid=-5";
         $stmt = $pdo->query($query, PDO::FETCH_ASSOC);
-        assertType('PDOStatement<array>', $stmt);
+        assertType('PDOStatement', $stmt);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,9 @@ public function supportedFetchTypes(PDO $pdo)`
`26`	`26`	`public function unsupportedFetchTypes(PDO $pdo)`
`27`	`27`	`{`
`28`	`28`	`$stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada', PDO::FETCH_COLUMN);`
`29`		`- assertType('PDOStatement<array>', $stmt);`
	`29`	`+ assertType('PDOStatement', $stmt);`
`30`	`30`
`31`	`31`	`$stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada', PDO::FETCH_OBJ);`
`32`		`- assertType('PDOStatement<array>', $stmt);`
	`32`	`+ assertType('PDOStatement', $stmt);`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,9 @@ public function quotedArguments(PDO $pdo, int $i, float $f, $n, string $s, $nonE`
`72`	`72`
`73`	`73`	`// when quote() cannot return a numeric-string, we can't infer the precise result-type`
`74`	`74`	`$stmt = $pdo->query('SELECT email, adaid FROM ada WHERE adaid='.$pdo->quote($s), PDO::FETCH_ASSOC);`
`75`		`- assertType('PDOStatement<array>', $stmt);`
	`75`	`+ assertType('PDOStatement', $stmt);`
`76`	`76`
`77`	`77`	`$stmt = $pdo->query('SELECT email, adaid FROM ada WHERE adaid='.$pdo->quote($nonE), PDO::FETCH_ASSOC);`
`78`		`- assertType('PDOStatement<array>', $stmt);`
	`78`	`+ assertType('PDOStatement', $stmt);`
`79`	`79`	`}`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function queryWithNullColumn(PDO $pdo)`
`42`	`42`	`public function syntaxError(PDO $pdo)`
`43`	`43`	`{`
`44`	`44`	`$stmt = $pdo->query('SELECT email adaid WHERE gesperrt freigabe1u1 FROM ada', PDO::FETCH_ASSOC);`
`45`		`- assertType('PDOStatement<array>', $stmt);`
	`45`	`+ assertType('PDOStatement', $stmt);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/**`
`@@ -76,39 +76,39 @@ public function concatedQuerySelected(PDO $pdo, int $int, string $string, float`
`76`	`76`	`// ---- queries, for which we cannot infer the return type`
`77`	`77`
`78`	`78`	`$stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE '.$string, PDO::FETCH_ASSOC);`
`79`		`- assertType('PDOStatement<array>', $stmt);`
	`79`	`+ assertType('PDOStatement', $stmt);`
`80`	`80`
`81`	`81`	`$stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE '.$nonEmptyString, PDO::FETCH_ASSOC);`
`82`		`- assertType('PDOStatement<array>', $stmt);`
	`82`	`+ assertType('PDOStatement', $stmt);`
`83`	`83`
`84`	`84`	`$stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada WHERE '.$mixed, PDO::FETCH_ASSOC);`
`85`		`- assertType('PDOStatement<array>', $stmt);`
	`85`	`+ assertType('PDOStatement', $stmt);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`public function dynamicQuery(PDO $pdo, string $query)`
`89`	`89`	`{`
`90`	`90`	`$stmt = $pdo->query($query, PDO::FETCH_ASSOC);`
`91`		`- assertType('PDOStatement<array>', $stmt);`
	`91`	`+ assertType('PDOStatement', $stmt);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`public function insertQuery(PDO $pdo)`
`95`	`95`	`{`
`96`	`96`	`$query = "INSERT INTO ada SET email='test@complex-it.de'";`
`97`	`97`	`$stmt = $pdo->query($query, PDO::FETCH_ASSOC);`
`98`		`- assertType('PDOStatement<array>', $stmt);`
	`98`	`+ assertType('PDOStatement', $stmt);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`public function replaceQuery(PDO $pdo)`
`102`	`102`	`{`
`103`	`103`	`$query = "REPLACE INTO ada SET email='test@complex-it.de'";`
`104`	`104`	`$stmt = $pdo->query($query, PDO::FETCH_ASSOC);`
`105`		`- assertType('PDOStatement<array>', $stmt);`
	`105`	`+ assertType('PDOStatement', $stmt);`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`public function updateQuery(PDO $pdo)`
`109`	`109`	`{`
`110`	`110`	`$query = "UPDATE ada SET email='test@complex-it.de' where adaid=-5";`
`111`	`111`	`$stmt = $pdo->query($query, PDO::FETCH_ASSOC);`
`112`		`- assertType('PDOStatement<array>', $stmt);`
	`112`	`+ assertType('PDOStatement', $stmt);`
`113`	`113`	`}`
`114`	`114`	`}`