fixed regression (#453)

staabm · Nov 1, 2022 · 209142a · 209142a
1 parent f9d94b1
commit 209142a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/src/Rules/QueryPlanAnalyzerRule.php b/src/Rules/QueryPlanAnalyzerRule.php
@@ -67,19 +67,25 @@ public function processNode(Node $callLike, Scope $scope): array
         }
 
         $queryArgPosition = null;
+        $unsupportedMethod = true;
         foreach ($this->classMethods as $classMethod) {
             sscanf($classMethod, '%[^::]::%[^#]#%i', $className, $methodName, $queryArgPosition);
             if (!\is_string($className) || !\is_string($methodName) || !\is_int($queryArgPosition)) {
                 throw new ShouldNotHappenException('Invalid classMethod definition');
             }
 
             if ($methodName === $methodReflection->getName() &&
-                ($methodReflection->getDeclaringClass()->getName() === $className || $methodReflection->getDeclaringClass()->isSubclassOf($className))) {
+                ($methodReflection->getDeclaringClass()->getName() === $className || $methodReflection->getDeclaringClass()->isSubclassOf($className))
+            ) {
+                $unsupportedMethod = false;
                 break;
             }
         }
 
         if (null === $queryArgPosition) {
+            throw new ShouldNotHappenException('Invalid classMethod definition');
+        }
+        if ($unsupportedMethod) {
             return [];
         }
 

diff --git a/src/Rules/SyntaxErrorInQueryFunctionRule.php b/src/Rules/SyntaxErrorInQueryFunctionRule.php
@@ -59,18 +59,23 @@ public function processNode(Node $node, Scope $scope): array
         }
 
         $queryArgPosition = null;
+        $unsupportedFunction = true;
         foreach ($this->functionNames as $functionName) {
             sscanf($functionName, '%[^#]#%i', $functionName, $queryArgPosition);
             if (!\is_string($functionName) || !\is_int($queryArgPosition)) {
                 throw new ShouldNotHappenException('Invalid functionName definition');
             }
 
             if (strtolower($functionName) === strtolower($calledFunctionName)) {
+                $unsupportedFunction = false;
                 break;
             }
         }
 
         if (null === $queryArgPosition) {
+            throw new ShouldNotHappenException('Invalid classMethod definition');
+        }
+        if ($unsupportedFunction) {
             return [];
         }
 

diff --git a/src/Rules/SyntaxErrorInQueryMethodRule.php b/src/Rules/SyntaxErrorInQueryMethodRule.php
@@ -51,19 +51,25 @@ public function processNode(Node $node, Scope $scope): array
         }
 
         $queryArgPosition = null;
+        $unsupportedMethod = true;
         foreach ($this->classMethods as $classMethod) {
             sscanf($classMethod, '%[^::]::%[^#]#%i', $className, $methodName, $queryArgPosition);
             if (!\is_string($className) || !\is_string($methodName) || !\is_int($queryArgPosition)) {
                 throw new ShouldNotHappenException('Invalid classMethod definition');
             }
 
             if ($methodName === $methodReflection->getName() &&
-                ($methodReflection->getDeclaringClass()->getName() === $className || $methodReflection->getDeclaringClass()->isSubclassOf($className))) {
+                ($methodReflection->getDeclaringClass()->getName() === $className || $methodReflection->getDeclaringClass()->isSubclassOf($className))
+            ) {
+                $unsupportedMethod = false;
                 break;
             }
         }
 
         if (null === $queryArgPosition) {
+            throw new ShouldNotHappenException('Invalid classMethod definition');
+        }
+        if ($unsupportedMethod) {
             return [];
         }