Fix nikic/php-parser deprecation warnings (#655)

staabm · web-flow · commit 338d7be766b3 · 2024-05-16T16:57:40.000Z
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -35,6 +35,3 @@ parameters:
         -
             message: '#^Instanceof between mysqli_result<array<string, int<-2147483648, 2147483647>\|string\|null>> and mysqli_result will always evaluate to true\.$#'
             path: src/DbSchema/SchemaHasherMysql.php
-
-        # nikic/php-parser 4.x compat
-        - '#Call to deprecated method getLine\(\) of class PhpParser\\NodeAbstract.*#'
diff --git a/src/Rules/DoctrineKeyValueStyleRule.php b/src/Rules/DoctrineKeyValueStyleRule.php
@@ -114,7 +114,7 @@ public function processNode(Node $callLike, Scope $scope): array
         $tableNames = $tableType->getConstantStrings();
         if (\count($tableNames) === 0) {
             return [
-                RuleErrorBuilder::message('Argument #0 expects a constant string, got ' . $tableType->describe(VerbosityLevel::precise()))->line($callLike->getLine())->build(),
+                RuleErrorBuilder::message('Argument #0 expects a constant string, got ' . $tableType->describe(VerbosityLevel::precise()))->line($callLike->getStartLine())->build(),
             ];
         }
 
@@ -185,7 +185,7 @@ public function processNode(Node $callLike, Scope $scope): array
 
         $ruleErrors = [];
         foreach ($errors as $error) {
-            $ruleErrors[] = RuleErrorBuilder::message('Query error: ' . $error)->line($callLike->getLine())->build();
+            $ruleErrors[] = RuleErrorBuilder::message('Query error: ' . $error)->line($callLike->getStartLine())->build();
         }
         return $ruleErrors;
     }
diff --git a/src/Rules/PdoStatementExecuteMethodRule.php b/src/Rules/PdoStatementExecuteMethodRule.php
@@ -97,7 +97,7 @@ private function checkErrors(MethodReflection $methodReflection, MethodCall $met
             $parameters = $queryReflection->resolveParameters($parameterTypes) ?? [];
         } catch (UnresolvableQueryException $exception) {
             return [
-                RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($methodCall->getLine())->build(),
+                RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($methodCall->getStartLine())->build(),
             ];
         }
 
@@ -110,13 +110,13 @@ private function checkErrors(MethodReflection $methodReflection, MethodCall $met
             }
         } catch (UnresolvableQueryException $exception) {
             return [
-                RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($methodCall->getLine())->build(),
+                RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($methodCall->getStartLine())->build(),
             ];
         }
 
         $ruleErrors = [];
         foreach ($errors as $error) {
-            $ruleErrors[] = RuleErrorBuilder::message($error)->line($methodCall->getLine())->build();
+            $ruleErrors[] = RuleErrorBuilder::message($error)->line($methodCall->getStartLine())->build();
         }
 
         return $ruleErrors;
diff --git a/src/Rules/QueryPlanAnalyzerRule.php b/src/Rules/QueryPlanAnalyzerRule.php
@@ -92,7 +92,7 @@ public function processNode(Node $callLike, Scope $scope): array
             return $this->analyze($callLike, $scope);
         } catch (UnresolvableQueryException $exception) {
             return [
-                RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($callLike->getLine())->build(),
+                RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($callLike->getStartLine())->build(),
             ];
         }
     }
@@ -144,7 +144,7 @@ private function analyze(CallLike $callLike, Scope $scope): array
                             $table
                         )
                     )
-                        ->line($callLike->getLine())
+                        ->line($callLike->getStartLine())
                         ->tip('see Mysql Docs https://dev.mysql.com/doc/refman/8.0/en/select-optimization.html')
                         ->build();
                 }
@@ -156,7 +156,7 @@ private function analyze(CallLike $callLike, Scope $scope): array
                             $table
                         )
                     )
-                        ->line($callLike->getLine())
+                        ->line($callLike->getStartLine())
                         ->tip('see Mysql Docs https://dev.mysql.com/doc/refman/8.0/en/table-scan-avoidance.html')
                         ->build();
                 }
@@ -168,7 +168,7 @@ private function analyze(CallLike $callLike, Scope $scope): array
                             $table
                         )
                     )
-                        ->line($callLike->getLine())
+                        ->line($callLike->getStartLine())
                         ->tip('see Mysql Docs https://dev.mysql.com/doc/refman/8.0/en/select-optimization.html')
                         ->build();
                 }
diff --git a/src/Rules/SyntaxErrorInDibiPreparedStatementMethodRule.php b/src/Rules/SyntaxErrorInDibiPreparedStatementMethodRule.php
@@ -169,7 +169,7 @@ private function checkErrors(CallLike $callLike, Scope $scope, MethodReflection
                 }
 
                 return [
-                    RuleErrorBuilder::message($placeholderExpectation . ', ' . $parameterActual . '.')->line($callLike->getLine())->build(),
+                    RuleErrorBuilder::message($placeholderExpectation . ', ' . $parameterActual . '.')->line($callLike->getStartLine())->build(),
                 ];
             }
         }
@@ -194,7 +194,7 @@ private function checkErrors(CallLike $callLike, Scope $scope, MethodReflection
         $validity = $queryReflection->validateQueryString($queryParameters[0]);
 
         if (null !== $validity) {
-            return [RuleErrorBuilder::message($validity->asRuleMessage())->line($callLike->getLine())->build()];
+            return [RuleErrorBuilder::message($validity->asRuleMessage())->line($callLike->getStartLine())->build()];
         }
 
         $result = $queryReflection->getResultType($queryParameters[0], QueryReflector::FETCH_TYPE_BOTH);
@@ -204,11 +204,11 @@ private function checkErrors(CallLike $callLike, Scope $scope, MethodReflection
             $columnsInResult = \count($result->getValueTypes()) / 2;
 
             if ('fetchPairs' === $methodReflection->getName() && 2 !== $columnsInResult) {
-                return [RuleErrorBuilder::message('fetchPairs requires exactly 2 selected columns, got ' . $columnsInResult . '.')->line($callLike->getLine())->build()];
+                return [RuleErrorBuilder::message('fetchPairs requires exactly 2 selected columns, got ' . $columnsInResult . '.')->line($callLike->getStartLine())->build()];
             }
 
             if ('fetchSingle' === $methodReflection->getName() && 1 !== $columnsInResult) {
-                return [RuleErrorBuilder::message('fetchSingle requires exactly 1 selected column, got ' . $columnsInResult . '.')->line($callLike->getLine())->build()];
+                return [RuleErrorBuilder::message('fetchSingle requires exactly 1 selected column, got ' . $columnsInResult . '.')->line($callLike->getStartLine())->build()];
             }
         }
 
diff --git a/src/Rules/SyntaxErrorInPreparedStatementMethodRule.php b/src/Rules/SyntaxErrorInPreparedStatementMethodRule.php
@@ -113,7 +113,7 @@ private function checkErrors(CallLike $callLike, Scope $scope): array
                 $parameters = $queryReflection->resolveParameters($parameterTypes) ?? [];
             } catch (UnresolvableQueryException $exception) {
                 return [
-                    RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($callLike->getLine())->build(),
+                    RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($callLike->getStartLine())->build(),
                 ];
             }
         }
@@ -144,13 +144,13 @@ private function checkErrors(CallLike $callLike, Scope $scope): array
 
             $ruleErrors = [];
             foreach ($errors as $error) {
-                $ruleErrors[] = RuleErrorBuilder::message($error)->line($callLike->getLine())->build();
+                $ruleErrors[] = RuleErrorBuilder::message($error)->line($callLike->getStartLine())->build();
             }
 
             return $ruleErrors;
         } catch (UnresolvableQueryException $exception) {
             return [
-                RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($callLike->getLine())->build(),
+                RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($callLike->getStartLine())->build(),
             ];
         }
     }
diff --git a/src/Rules/SyntaxErrorInQueryFunctionRule.php b/src/Rules/SyntaxErrorInQueryFunctionRule.php
@@ -96,13 +96,13 @@ public function processNode(Node $node, Scope $scope): array
                 $queryError = $queryReflection->validateQueryString($queryString);
                 if (null !== $queryError) {
                     return [
-                        RuleErrorBuilder::message($queryError->asRuleMessage())->line($node->getLine())->build(),
+                        RuleErrorBuilder::message($queryError->asRuleMessage())->line($node->getStartLine())->build(),
                     ];
                 }
             }
         } catch (UnresolvableQueryException $exception) {
             return [
-                RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($node->getLine())->build(),
+                RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($node->getStartLine())->build(),
             ];
         }
 
diff --git a/src/Rules/SyntaxErrorInQueryMethodRule.php b/src/Rules/SyntaxErrorInQueryMethodRule.php
@@ -91,13 +91,13 @@ public function processNode(Node $node, Scope $scope): array
                 $queryError = $queryReflection->validateQueryString($queryString);
                 if (null !== $queryError) {
                     return [
-                        RuleErrorBuilder::message($queryError->asRuleMessage())->line($node->getLine())->build(),
+                        RuleErrorBuilder::message($queryError->asRuleMessage())->line($node->getStartLine())->build(),
                     ];
                 }
             }
         } catch (UnresolvableQueryException $exception) {
             return [
-                RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($node->getLine())->build(),
+                RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($node->getStartLine())->build(),
             ];
         }
 

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,3 @@ parameters:`
`35`	`35`	`-`
`36`	`36`	`message: '#^Instanceof between mysqli_result<array<string, int<-2147483648, 2147483647>\\|string\\|null>> and mysqli_result will always evaluate to true\.$#'`
`37`	`37`	`path: src/DbSchema/SchemaHasherMysql.php`
`38`		`-`
`39`		`- # nikic/php-parser 4.x compat`
`40`		`- - '#Call to deprecated method getLine\(\) of class PhpParser\\NodeAbstract.*#'`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public function processNode(Node $callLike, Scope $scope): array`
`114`	`114`	`$tableNames = $tableType->getConstantStrings();`
`115`	`115`	`if (\count($tableNames) === 0) {`
`116`	`116`	`return [`
`117`		`- RuleErrorBuilder::message('Argument #0 expects a constant string, got ' . $tableType->describe(VerbosityLevel::precise()))->line($callLike->getLine())->build(),`
	`117`	`+ RuleErrorBuilder::message('Argument #0 expects a constant string, got ' . $tableType->describe(VerbosityLevel::precise()))->line($callLike->getStartLine())->build(),`
`118`	`118`	`];`
`119`	`119`	`}`
`120`	`120`
`@@ -185,7 +185,7 @@ public function processNode(Node $callLike, Scope $scope): array`
`185`	`185`
`186`	`186`	`$ruleErrors = [];`
`187`	`187`	`foreach ($errors as $error) {`
`188`		`- $ruleErrors[] = RuleErrorBuilder::message('Query error: ' . $error)->line($callLike->getLine())->build();`
	`188`	`+ $ruleErrors[] = RuleErrorBuilder::message('Query error: ' . $error)->line($callLike->getStartLine())->build();`
`189`	`189`	`}`
`190`	`190`	`return $ruleErrors;`
`191`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ private function checkErrors(MethodReflection $methodReflection, MethodCall $met`
`97`	`97`	`$parameters = $queryReflection->resolveParameters($parameterTypes) ?? [];`
`98`	`98`	`} catch (UnresolvableQueryException $exception) {`
`99`	`99`	`return [`
`100`		`- RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($methodCall->getLine())->build(),`
	`100`	`+ RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($methodCall->getStartLine())->build(),`
`101`	`101`	`];`
`102`	`102`	`}`
`103`	`103`
`@@ -110,13 +110,13 @@ private function checkErrors(MethodReflection $methodReflection, MethodCall $met`
`110`	`110`	`}`
`111`	`111`	`} catch (UnresolvableQueryException $exception) {`
`112`	`112`	`return [`
`113`		`- RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($methodCall->getLine())->build(),`
	`113`	`+ RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($methodCall->getStartLine())->build(),`
`114`	`114`	`];`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`$ruleErrors = [];`
`118`	`118`	`foreach ($errors as $error) {`
`119`		`- $ruleErrors[] = RuleErrorBuilder::message($error)->line($methodCall->getLine())->build();`
	`119`	`+ $ruleErrors[] = RuleErrorBuilder::message($error)->line($methodCall->getStartLine())->build();`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`return $ruleErrors;`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function processNode(Node $callLike, Scope $scope): array`
`92`	`92`	`return $this->analyze($callLike, $scope);`
`93`	`93`	`} catch (UnresolvableQueryException $exception) {`
`94`	`94`	`return [`
`95`		`- RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($callLike->getLine())->build(),`
	`95`	`+ RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($callLike->getStartLine())->build(),`
`96`	`96`	`];`
`97`	`97`	`}`
`98`	`98`	`}`
`@@ -144,7 +144,7 @@ private function analyze(CallLike $callLike, Scope $scope): array`
`144`	`144`	`$table`
`145`	`145`	`)`
`146`	`146`	`)`
`147`		`- ->line($callLike->getLine())`
	`147`	`+ ->line($callLike->getStartLine())`
`148`	`148`	`->tip('see Mysql Docs https://dev.mysql.com/doc/refman/8.0/en/select-optimization.html')`
`149`	`149`	`->build();`
`150`	`150`	`}`
`@@ -156,7 +156,7 @@ private function analyze(CallLike $callLike, Scope $scope): array`
`156`	`156`	`$table`
`157`	`157`	`)`
`158`	`158`	`)`
`159`		`- ->line($callLike->getLine())`
	`159`	`+ ->line($callLike->getStartLine())`
`160`	`160`	`->tip('see Mysql Docs https://dev.mysql.com/doc/refman/8.0/en/table-scan-avoidance.html')`
`161`	`161`	`->build();`
`162`	`162`	`}`
`@@ -168,7 +168,7 @@ private function analyze(CallLike $callLike, Scope $scope): array`
`168`	`168`	`$table`
`169`	`169`	`)`
`170`	`170`	`)`
`171`		`- ->line($callLike->getLine())`
	`171`	`+ ->line($callLike->getStartLine())`
`172`	`172`	`->tip('see Mysql Docs https://dev.mysql.com/doc/refman/8.0/en/select-optimization.html')`
`173`	`173`	`->build();`
`174`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ private function checkErrors(CallLike $callLike, Scope $scope, MethodReflection`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`return [`
`172`		`- RuleErrorBuilder::message($placeholderExpectation . ', ' . $parameterActual . '.')->line($callLike->getLine())->build(),`
	`172`	`+ RuleErrorBuilder::message($placeholderExpectation . ', ' . $parameterActual . '.')->line($callLike->getStartLine())->build(),`
`173`	`173`	`];`
`174`	`174`	`}`
`175`	`175`	`}`
`@@ -194,7 +194,7 @@ private function checkErrors(CallLike $callLike, Scope $scope, MethodReflection`
`194`	`194`	`$validity = $queryReflection->validateQueryString($queryParameters[0]);`
`195`	`195`
`196`	`196`	`if (null !== $validity) {`
`197`		`- return [RuleErrorBuilder::message($validity->asRuleMessage())->line($callLike->getLine())->build()];`
	`197`	`+ return [RuleErrorBuilder::message($validity->asRuleMessage())->line($callLike->getStartLine())->build()];`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`$result = $queryReflection->getResultType($queryParameters[0], QueryReflector::FETCH_TYPE_BOTH);`
`@@ -204,11 +204,11 @@ private function checkErrors(CallLike $callLike, Scope $scope, MethodReflection`
`204`	`204`	`$columnsInResult = \count($result->getValueTypes()) / 2;`
`205`	`205`
`206`	`206`	`if ('fetchPairs' === $methodReflection->getName() && 2 !== $columnsInResult) {`
`207`		`- return [RuleErrorBuilder::message('fetchPairs requires exactly 2 selected columns, got ' . $columnsInResult . '.')->line($callLike->getLine())->build()];`
	`207`	`+ return [RuleErrorBuilder::message('fetchPairs requires exactly 2 selected columns, got ' . $columnsInResult . '.')->line($callLike->getStartLine())->build()];`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`if ('fetchSingle' === $methodReflection->getName() && 1 !== $columnsInResult) {`
`211`		`- return [RuleErrorBuilder::message('fetchSingle requires exactly 1 selected column, got ' . $columnsInResult . '.')->line($callLike->getLine())->build()];`
	`211`	`+ return [RuleErrorBuilder::message('fetchSingle requires exactly 1 selected column, got ' . $columnsInResult . '.')->line($callLike->getStartLine())->build()];`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ private function checkErrors(CallLike $callLike, Scope $scope): array`
`113`	`113`	`$parameters = $queryReflection->resolveParameters($parameterTypes) ?? [];`
`114`	`114`	`} catch (UnresolvableQueryException $exception) {`
`115`	`115`	`return [`
`116`		`- RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($callLike->getLine())->build(),`
	`116`	`+ RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($callLike->getStartLine())->build(),`
`117`	`117`	`];`
`118`	`118`	`}`
`119`	`119`	`}`
`@@ -144,13 +144,13 @@ private function checkErrors(CallLike $callLike, Scope $scope): array`
`144`	`144`
`145`	`145`	`$ruleErrors = [];`
`146`	`146`	`foreach ($errors as $error) {`
`147`		`- $ruleErrors[] = RuleErrorBuilder::message($error)->line($callLike->getLine())->build();`
	`147`	`+ $ruleErrors[] = RuleErrorBuilder::message($error)->line($callLike->getStartLine())->build();`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`return $ruleErrors;`
`151`	`151`	`} catch (UnresolvableQueryException $exception) {`
`152`	`152`	`return [`
`153`		`- RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($callLike->getLine())->build(),`
	`153`	`+ RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($callLike->getStartLine())->build(),`
`154`	`154`	`];`
`155`	`155`	`}`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,13 +96,13 @@ public function processNode(Node $node, Scope $scope): array`
`96`	`96`	`$queryError = $queryReflection->validateQueryString($queryString);`
`97`	`97`	`if (null !== $queryError) {`
`98`	`98`	`return [`
`99`		`- RuleErrorBuilder::message($queryError->asRuleMessage())->line($node->getLine())->build(),`
	`99`	`+ RuleErrorBuilder::message($queryError->asRuleMessage())->line($node->getStartLine())->build(),`
`100`	`100`	`];`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`	`} catch (UnresolvableQueryException $exception) {`
`104`	`104`	`return [`
`105`		`- RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($node->getLine())->build(),`
	`105`	`+ RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($node->getStartLine())->build(),`
`106`	`106`	`];`
`107`	`107`	`}`
`108`	`108`
Original file line number	Diff line number	Diff line change
`@@ -91,13 +91,13 @@ public function processNode(Node $node, Scope $scope): array`
`91`	`91`	`$queryError = $queryReflection->validateQueryString($queryString);`
`92`	`92`	`if (null !== $queryError) {`
`93`	`93`	`return [`
`94`		`- RuleErrorBuilder::message($queryError->asRuleMessage())->line($node->getLine())->build(),`
	`94`	`+ RuleErrorBuilder::message($queryError->asRuleMessage())->line($node->getStartLine())->build(),`
`95`	`95`	`];`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`	`} catch (UnresolvableQueryException $exception) {`
`99`	`99`	`return [`
`100`		`- RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($node->getLine())->build(),`
	`100`	`+ RuleErrorBuilder::message($exception->asRuleMessage())->tip($exception::getTip())->line($node->getStartLine())->build(),`
`101`	`101`	`];`
`102`	`102`	`}`
`103`	`103`