de-duplicate (#33)

staabm · web-flow · commit 848a5670204b · 2022-01-04T21:18:37.000+01:00
diff --git a/src/Extensions/DeployerRunMysqlQueryDynamicReturnTypeExtension.php b/src/Extensions/DeployerRunMysqlQueryDynamicReturnTypeExtension.php
@@ -29,15 +29,16 @@ public function isFunctionSupported(FunctionReflection $functionReflection): boo
     public function getTypeFromFunctionCall(FunctionReflection $functionReflection, FuncCall $functionCall, Scope $scope): Type
     {
         $args = $functionCall->getArgs();
+        $defaultReturn = ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
 
         if (\count($args) < 2) {
-            return ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
+            return $defaultReturn;
         }
 
         $queryReflection = new QueryReflection();
         $queryString = $queryReflection->resolveQueryString($args[0]->value, $scope);
         if (null === $queryString) {
-            return ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
+            return $defaultReturn;
         }
 
         $resultType = $queryReflection->getResultType($queryString, QueryReflector::FETCH_TYPE_NUMERIC);
@@ -50,6 +51,6 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
             return TypeCombinator::addNull(new ArrayType(new IntegerType(), $builder->getArray()));
         }
 
-        return ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
+        return $defaultReturn;
     }
 }
diff --git a/src/Extensions/MysqliQueryDynamicReturnTypeExtension.php b/src/Extensions/MysqliQueryDynamicReturnTypeExtension.php
@@ -41,15 +41,16 @@ public function isFunctionSupported(FunctionReflection $functionReflection): boo
     public function getTypeFromFunctionCall(FunctionReflection $functionReflection, FuncCall $functionCall, Scope $scope): Type
     {
         $args = $functionCall->getArgs();
+        $defaultReturn = ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
 
         if (\count($args) < 2) {
-            return ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
+            return $defaultReturn;
         }
 
         $queryReflection = new QueryReflection();
         $queryString = $queryReflection->resolveQueryString($args[1]->value, $scope);
         if (null === $queryString) {
-            return ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
+            return $defaultReturn;
         }
 
         $resultType = $queryReflection->getResultType($queryString, QueryReflector::FETCH_TYPE_ASSOC);
@@ -60,21 +61,22 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
             );
         }
 
-        return ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
+        return $defaultReturn;
     }
 
     public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
     {
         $args = $methodCall->getArgs();
+        $defaultReturn = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
 
         if (\count($args) < 1) {
-            return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+            return $defaultReturn;
         }
 
         $queryReflection = new QueryReflection();
         $queryString = $queryReflection->resolveQueryString($args[0]->value, $scope);
         if (null === $queryString) {
-            return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+            return $defaultReturn;
         }
 
         $resultType = $queryReflection->getResultType($queryString, QueryReflector::FETCH_TYPE_ASSOC);
@@ -85,6 +87,6 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
             );
         }
 
-        return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+        return $defaultReturn;
     }
 }
diff --git a/src/Extensions/PdoQuoteDynamicReturnTypeExtension.php b/src/Extensions/PdoQuoteDynamicReturnTypeExtension.php
@@ -34,16 +34,18 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
     public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
     {
         $args = $methodCall->getArgs();
+        $defaultReturn = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+
         if (\count($args) < 1) {
-            return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+            return $defaultReturn;
         }
 
         if (1 === \count($args)) {
             $type = PDO::PARAM_STR;
         } else {
             $typeType = $scope->getType($args[1]->value);
             if (!$typeType instanceof ConstantIntegerType) {
-                return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+                return $defaultReturn;
             }
             $type = $typeType->getValue();
         }

Original file line number	Diff line number	Diff line change
`@@ -29,15 +29,16 @@ public function isFunctionSupported(FunctionReflection $functionReflection): boo`
`29`	`29`	`public function getTypeFromFunctionCall(FunctionReflection $functionReflection, FuncCall $functionCall, Scope $scope): Type`
`30`	`30`	`{`
`31`	`31`	`$args = $functionCall->getArgs();`
	`32`	`+ $defaultReturn = ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();`
`32`	`33`
`33`	`34`	`if (\count($args) < 2) {`
`34`		`- return ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();`
	`35`	`+ return $defaultReturn;`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`$queryReflection = new QueryReflection();`
`38`	`39`	`$queryString = $queryReflection->resolveQueryString($args[0]->value, $scope);`
`39`	`40`	`if (null === $queryString) {`
`40`		`- return ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();`
	`41`	`+ return $defaultReturn;`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`$resultType = $queryReflection->getResultType($queryString, QueryReflector::FETCH_TYPE_NUMERIC);`
`@@ -50,6 +51,6 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,`
`50`	`51`	`return TypeCombinator::addNull(new ArrayType(new IntegerType(), $builder->getArray()));`
`51`	`52`	`}`
`52`	`53`
`53`		`- return ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();`
	`54`	`+ return $defaultReturn;`
`54`	`55`	`}`
`55`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,15 +41,16 @@ public function isFunctionSupported(FunctionReflection $functionReflection): boo`
`41`	`41`	`public function getTypeFromFunctionCall(FunctionReflection $functionReflection, FuncCall $functionCall, Scope $scope): Type`
`42`	`42`	`{`
`43`	`43`	`$args = $functionCall->getArgs();`
	`44`	`+ $defaultReturn = ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();`
`44`	`45`
`45`	`46`	`if (\count($args) < 2) {`
`46`		`- return ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();`
	`47`	`+ return $defaultReturn;`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`$queryReflection = new QueryReflection();`
`50`	`51`	`$queryString = $queryReflection->resolveQueryString($args[1]->value, $scope);`
`51`	`52`	`if (null === $queryString) {`
`52`		`- return ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();`
	`53`	`+ return $defaultReturn;`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`$resultType = $queryReflection->getResultType($queryString, QueryReflector::FETCH_TYPE_ASSOC);`
`@@ -60,21 +61,22 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,`
`60`	`61`	`);`
`61`	`62`	`}`
`62`	`63`
`63`		`- return ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();`
	`64`	`+ return $defaultReturn;`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type`
`67`	`68`	`{`
`68`	`69`	`$args = $methodCall->getArgs();`
	`70`	`+ $defaultReturn = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();`
`69`	`71`
`70`	`72`	`if (\count($args) < 1) {`
`71`		`- return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();`
	`73`	`+ return $defaultReturn;`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`$queryReflection = new QueryReflection();`
`75`	`77`	`$queryString = $queryReflection->resolveQueryString($args[0]->value, $scope);`
`76`	`78`	`if (null === $queryString) {`
`77`		`- return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();`
	`79`	`+ return $defaultReturn;`
`78`	`80`	`}`
`79`	`81`
`80`	`82`	`$resultType = $queryReflection->getResultType($queryString, QueryReflector::FETCH_TYPE_ASSOC);`
`@@ -85,6 +87,6 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method`
`85`	`87`	`);`
`86`	`88`	`}`
`87`	`89`
`88`		`- return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();`
	`90`	`+ return $defaultReturn;`
`89`	`91`	`}`
`90`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,16 +34,18 @@ public function isMethodSupported(MethodReflection $methodReflection): bool`
`34`	`34`	`public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type`
`35`	`35`	`{`
`36`	`36`	`$args = $methodCall->getArgs();`
	`37`	`+ $defaultReturn = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();`
	`38`	`+`
`37`	`39`	`if (\count($args) < 1) {`
`38`		`- return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();`
	`40`	`+ return $defaultReturn;`
`39`	`41`	`}`
`40`	`42`
`41`	`43`	`if (1 === \count($args)) {`
`42`	`44`	`$type = PDO::PARAM_STR;`
`43`	`45`	`} else {`
`44`	`46`	`$typeType = $scope->getType($args[1]->value);`
`45`	`47`	`if (!$typeType instanceof ConstantIntegerType) {`
`46`		`- return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();`
	`48`	`+ return $defaultReturn;`
`47`	`49`	`}`
`48`	`50`	`$type = $typeType->getValue();`
`49`	`51`	`}`