fix deprecations (#546)

Author: staabm

phpstan-baseline.neon

@@ -58,11 +58,6 @@ parameters:
 			count: 1
 			path: src/Extensions/PdoStatementFetchDynamicReturnTypeExtension.php
 
-		-
-			message: "#^Strict comparison using \\!\\=\\= between null and PHPStan\\\\Type\\\\Type will always evaluate to true\\.$#"
-			count: 1
-			path: src/Extensions/PdoStatementFetchDynamicReturnTypeExtension.php
-
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantStringType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantStrings\\(\\) instead\\.$#"
 			count: 1
@@ -88,22 +83,6 @@ parameters:
 			count: 1
 			path: src/QueryReflection/DbaApi.php
 
-		-
-			message: """
-				#^Call to deprecated method getConstantArrays\\(\\) of class PHPStan\\\\Type\\\\TypeUtils\\:
-				Use PHPStan\\\\Type\\\\Type\\:\\:getConstantArrays\\(\\) instead and handle optional keys if necessary\\.$#
-			"""
-			count: 1
-			path: src/QueryReflection/QueryReflection.php
-
-		-
-			message: """
-				#^Call to deprecated method getConstantStrings\\(\\) of class PHPStan\\\\Type\\\\TypeUtils\\:
-				Use PHPStan\\\\Type\\\\Type\\:\\:getConstantStrings\\(\\) instead$#
-			"""
-			count: 1
-			path: src/QueryReflection/QueryReflection.php
-
 		-
 			message: """
 				#^Call to deprecated method resolvePreparedQueryString\\(\\) of class staabm\\\\PHPStanDba\\\\QueryReflection\\\\QueryReflection\\:

phpstan.neon.dist

@@ -5,6 +5,8 @@ includes:
     - phpstan-baseline.neon
 
 parameters:
+    editorUrl: 'phpstorm://open?file=%%file%%&line=%%line%%'
+
     level: max
 
     paths:

src/Extensions/PdoStatementFetchDynamicReturnTypeExtension.php

@@ -67,7 +67,7 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
         }
 
         // fetchAll() can return false prior to php8
-        if (null !== $returnType && ! $returnType instanceof MixedType && 'fetchAll' === $methodReflection->getName() && $this->phpVersion->getVersionId() >= 80000) {
+        if (! $returnType instanceof MixedType && 'fetchAll' === $methodReflection->getName() && $this->phpVersion->getVersionId() >= 80000) {
             $returnType = TypeCombinator::remove($returnType, new ConstantBooleanType(false));
         }
 

src/QueryReflection/QueryReflection.php

@@ -23,7 +23,6 @@
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
-use PHPStan\Type\TypeUtils;
 use PHPStan\Type\UnionType;
 use staabm\PHPStanDba\Analyzer\QueryPlanAnalyzerMysql;
 use staabm\PHPStanDba\Analyzer\QueryPlanQueryResolver;
@@ -223,7 +222,7 @@ public function resolvePreparedQueryStrings(Expr $queryExpr, Type $parameterType
                 return null;
             }
 
-            foreach (TypeUtils::getConstantStrings($type) as $constantString) {
+            foreach ($type->getConstantStrings() as $constantString) {
                 $queryString = $constantString->getValue();
                 $queryString = $this->replaceParameters($queryString, $parameters);
                 yield $this->normalizeQueryString($queryString);
@@ -407,7 +406,7 @@ public function resolveParameters(Type $parameterTypes): ?array
         $parameters = [];
 
         if ($parameterTypes instanceof UnionType) {
-            foreach (TypeUtils::getConstantArrays($parameterTypes) as $constantArray) {
+            foreach ($parameterTypes->getConstantArrays() as $constantArray) {
                 $parameters = $parameters + $this->resolveConstantArray($constantArray, true);
             }