Added missing ReflectionProvider->hasClass() checks (#758)

staabm · web-flow · commit ae4b1ba755b2 · 2025-05-06T12:25:03.000+02:00
diff --git a/src/Rules/DoctrineKeyValueStyleRule.php b/src/Rules/DoctrineKeyValueStyleRule.php
@@ -94,7 +94,11 @@ public function processNode(Node $callLike, Scope $scope): array
         $arrayArgPositions = [];
         foreach ($this->classMethods as [$className, $methodName, $arrayArgPositionsConfig]) {
             if ($methodName === $methodReflection->getName() &&
-                ($methodReflection->getDeclaringClass()->getName() === $className || $methodReflection->getDeclaringClass()->isSubclassOfClass($this->reflectionProvider->getClass($className)))) {
+                (
+                    $methodReflection->getDeclaringClass()->getName() === $className
+                    || ($this->reflectionProvider->hasClass($className) && $methodReflection->getDeclaringClass()->isSubclassOfClass($this->reflectionProvider->getClass($className)))
+                )
+            ) {
                 $arrayArgPositions = $arrayArgPositionsConfig;
                 $unsupportedMethod = false;
                 break;
diff --git a/src/Rules/QueryPlanAnalyzerRule.php b/src/Rules/QueryPlanAnalyzerRule.php
@@ -78,7 +78,10 @@ public function processNode(Node $callLike, Scope $scope): array
             }
 
             if ($methodName === $methodReflection->getName() &&
-                ($methodReflection->getDeclaringClass()->getName() === $className || $methodReflection->getDeclaringClass()->isSubclassOfClass($this->reflectionProvider->getClass($className)))
+                (
+                    $methodReflection->getDeclaringClass()->getName() === $className
+                    || ($this->reflectionProvider->hasClass($className) && $methodReflection->getDeclaringClass()->isSubclassOfClass($this->reflectionProvider->getClass($className)))
+                )
             ) {
                 $unsupportedMethod = false;
                 break;
diff --git a/src/Rules/SyntaxErrorInDibiPreparedStatementMethodRule.php b/src/Rules/SyntaxErrorInDibiPreparedStatementMethodRule.php
@@ -80,7 +80,11 @@ public function processNode(Node $callLike, Scope $scope): array
             }
 
             if ($methodName === $methodReflection->getName() &&
-                ($methodReflection->getDeclaringClass()->getName() === $className || $methodReflection->getDeclaringClass()->isSubclassOfClass($this->reflectionProvider->getClass($className)))) {
+                (
+                    $methodReflection->getDeclaringClass()->getName() === $className
+                    || ($this->reflectionProvider->hasClass($className) && $methodReflection->getDeclaringClass()->isSubclassOfClass($this->reflectionProvider->getClass($className)))
+                )
+            ) {
                 $unsupportedMethod = false;
                 break;
             }
diff --git a/src/Rules/SyntaxErrorInPreparedStatementMethodRule.php b/src/Rules/SyntaxErrorInPreparedStatementMethodRule.php
@@ -78,7 +78,11 @@ public function processNode(Node $callLike, Scope $scope): array
             }
 
             if ($methodName === $methodReflection->getName() &&
-                ($methodReflection->getDeclaringClass()->getName() === $className || $methodReflection->getDeclaringClass()->isSubclassOfClass($this->reflectionProvider->getClass($className)))) {
+                (
+                    $methodReflection->getDeclaringClass()->getName() === $className
+                    || ($this->reflectionProvider->hasClass($className) && $methodReflection->getDeclaringClass()->isSubclassOfClass($this->reflectionProvider->getClass($className)))
+                )
+            ) {
                 $unsupportedMethod = false;
                 break;
             }
diff --git a/src/Rules/SyntaxErrorInQueryMethodRule.php b/src/Rules/SyntaxErrorInQueryMethodRule.php
@@ -62,7 +62,10 @@ public function processNode(Node $node, Scope $scope): array
             }
 
             if ($methodName === $methodReflection->getName() &&
-                ($methodReflection->getDeclaringClass()->getName() === $className || $methodReflection->getDeclaringClass()->isSubclassOfClass($this->reflectionProvider->getClass($className)))
+                (
+                    $methodReflection->getDeclaringClass()->getName() === $className
+                    || ($this->reflectionProvider->hasClass($className) && $methodReflection->getDeclaringClass()->isSubclassOfClass($this->reflectionProvider->getClass($className)))
+                )
             ) {
                 $unsupportedMethod = false;
                 break;

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,11 @@ public function processNode(Node $callLike, Scope $scope): array`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`if ($methodName === $methodReflection->getName() &&`
`83`		`- ($methodReflection->getDeclaringClass()->getName() === $className \|\| $methodReflection->getDeclaringClass()->isSubclassOfClass($this->reflectionProvider->getClass($className)))) {`
	`83`	`+ (`
	`84`	`+ $methodReflection->getDeclaringClass()->getName() === $className`
	`85`	`+ \|\| ($this->reflectionProvider->hasClass($className) && $methodReflection->getDeclaringClass()->isSubclassOfClass($this->reflectionProvider->getClass($className)))`
	`86`	`+ )`
	`87`	`+ ) {`
`84`	`88`	`$unsupportedMethod = false;`
`85`	`89`	`break;`
`86`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,11 @@ public function processNode(Node $callLike, Scope $scope): array`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`if ($methodName === $methodReflection->getName() &&`
`81`		`- ($methodReflection->getDeclaringClass()->getName() === $className \|\| $methodReflection->getDeclaringClass()->isSubclassOfClass($this->reflectionProvider->getClass($className)))) {`
	`81`	`+ (`
	`82`	`+ $methodReflection->getDeclaringClass()->getName() === $className`
	`83`	`+ \|\| ($this->reflectionProvider->hasClass($className) && $methodReflection->getDeclaringClass()->isSubclassOfClass($this->reflectionProvider->getClass($className)))`
	`84`	`+ )`
	`85`	`+ ) {`
`82`	`86`	`$unsupportedMethod = false;`
`83`	`87`	`break;`
`84`	`88`	`}`