Fix ClassRegistryInit doesn't work with ClassConstFetch AST

ariddlestone · Jan 28, 2024 · 6a7822b · 6a7822b
1 parent 45eb613
commit 6a7822b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/ClassRegistryInitExtension.php b/src/ClassRegistryInitExtension.php
@@ -4,6 +4,8 @@
 
 namespace PHPStanCakePHP2;
 
+use PhpParser\Node\Expr\ClassConstFetch;
+use PhpParser\Node\Name;
 use PHPStanCakePHP2\Service\SchemaService;
 use Inflector;
 use PhpParser\ConstExprEvaluator;
@@ -44,9 +46,15 @@ public function isStaticMethodSupported(MethodReflection $methodReflection): boo
 
     public function getTypeFromStaticMethodCall(MethodReflection $methodReflection, StaticCall $methodCall, Scope $scope): ?Type
     {
-        $arg1 = $methodCall->getArgs()[0]->value;
+        $value = $methodCall->getArgs()[0]->value;
         $evaluator = new ConstExprEvaluator();
-        $arg1 = $evaluator->evaluateSilently($arg1);
+
+        if ($value instanceof ClassConstFetch && $value->class instanceof Name) {
+            $value = $value->class->toString();
+        }
+
+        $arg1 = $evaluator->evaluateSilently($value);
+
         if (! is_string($arg1)) {
             return $this->getDefaultType();
         }

diff --git a/tests/Feature/data/class_registry_init.php b/tests/Feature/data/class_registry_init.php
@@ -12,3 +12,6 @@
 
 $modelWithoutClass = ClassRegistry::init('TableWithoutModel');
 assertType('Model', $modelWithoutClass);
+
+$class = ClassRegistry::init(BasicModel::class);
+assertType('BasicModel', $class);