fix: resolvedName undefined when class is in the same namespace

SychO9 · SychO9 · commit b570b643de45 · 2025-02-22T11:53:37.000+01:00
diff --git a/php-subsystem/src/NodeUtil.php b/php-subsystem/src/NodeUtil.php
@@ -69,4 +69,9 @@ public static function addUsesToNamespace(Node\Stmt\Namespace_ $node, array $use
             array_splice($node->stmts, $lastUseStatement + 1, 0, $uses);
         }
     }
+
+    public static function className($expr): ?string
+    {
+        return $expr->getAttribute('resolvedName')?->name ?? $expr->name;
+    }
 }
diff --git a/php-subsystem/src/NodeVisitors/ChangeSignatures.php b/php-subsystem/src/NodeVisitors/ChangeSignatures.php
@@ -31,10 +31,10 @@ public function enterNode(Node $node)
 
         if (! $this->valid && $node instanceof Class_) {
             $implements = array_map(function (Node\Name $interface) {
-                return $interface->getAttribute('resolvedName')->name;
+                return NodeUtil::className($interface);
             }, $node->implements);
 
-            $extends = $node->extends ? $node->extends->getAttribute('resolvedName')->name : null;
+            $extends = $node->extends ? NodeUtil::className($node->extends) : null;
 
             if ($extends && isset($this->changes[$extends])) {
                 $this->valid = true;
diff --git a/php-subsystem/src/Upgrade/TwoPointOh/EmailViews.php b/php-subsystem/src/Upgrade/TwoPointOh/EmailViews.php
@@ -2,6 +2,7 @@
 
 namespace Flarum\CliPhpSubsystem\Upgrade\TwoPointOh;
 
+use Flarum\CliPhpSubsystem\NodeUtil;
 use Flarum\CliPhpSubsystem\NodeVisitors\ChangeSignatures;
 use Flarum\CliPhpSubsystem\Upgrade\Replacement;
 use Flarum\CliPhpSubsystem\Upgrade\ReplacementResult;
@@ -37,7 +38,7 @@ function run(string $file, string $code, array $ast, array $data): ?ReplacementR
 
             public function enterNode(\PhpParser\Node $node)
             {
-                if ($node instanceof \PhpParser\Node\Stmt\Class_ && (!$node->implements || ! in_array($this->interface, array_map(function ($interface) { return $interface->getAttribute('resolvedName')->name; }, $node->implements)))) {
+                if ($node instanceof \PhpParser\Node\Stmt\Class_ && (!$node->implements || ! in_array($this->interface, array_map(function ($interface) { return NodeUtil::className($interface); }, $node->implements)))) {
                     return NodeVisitor::DONT_TRAVERSE_CHILDREN;
                 }
 
@@ -53,7 +54,7 @@ public function enterNode(\PhpParser\Node $node)
 
             public function leaveNode(Node $node)
             {
-                if ($node instanceof \PhpParser\Node\Stmt\Class_ && (!$node->implements || ! in_array($this->interface, array_map(function ($interface) { return $interface->getAttribute('resolvedName')->name; }, $node->implements)))) {
+                if ($node instanceof \PhpParser\Node\Stmt\Class_ && (!$node->implements || ! in_array($this->interface, array_map(function ($interface) { return NodeUtil::className($interface); }, $node->implements)))) {
                     return NodeVisitor::STOP_TRAVERSAL;
                 }
 
diff --git a/php-subsystem/src/Upgrade/TwoPointOh/InterventionImage.php b/php-subsystem/src/Upgrade/TwoPointOh/InterventionImage.php
@@ -2,6 +2,7 @@
 
 namespace Flarum\CliPhpSubsystem\Upgrade\TwoPointOh;
 
+use Flarum\CliPhpSubsystem\NodeUtil;
 use Flarum\CliPhpSubsystem\NodeVisitors\ReplaceUses;
 use Flarum\CliPhpSubsystem\Upgrade\Replacement;
 use Flarum\CliPhpSubsystem\Upgrade\ReplacementResult;
@@ -35,9 +36,9 @@ public function enterNode(Node $node)
                 if ($node instanceof Node\Stmt\Property
                     && $node->type
                     && $node->type->hasAttribute('resolvedName')
-                    && strpos($node->type->getAttribute('resolvedName')->name, 'Intervention\\Image\\') === 0
+                    && strpos(NodeUtil::className($node->type), 'Intervention\\Image\\') === 0
                 ) {
-                    $this->propertyTypes[$node->props[0]->name->name] = $node->type->getAttribute('resolvedName')->name;
+                    $this->propertyTypes[$node->props[0]->name->name] = NodeUtil::className($node->type);
                 }
 
                 if ($node instanceof Node\Stmt\ClassMethod && $node->name->name === '__construct') {
@@ -46,12 +47,12 @@ public function enterNode(Node $node)
                             || ! $param->type
                             || ! $param->type->hasAttribute('resolvedName')
                             || ! is_string($param->var->name)
-                            || strpos($param->type->getAttribute('resolvedName')->name, 'Intervention\\Image\\') !== 0
+                            || strpos(NodeUtil::className($param->type), 'Intervention\\Image\\') !== 0
                         ) {
                             continue;
                         }
 
-                        $this->propertyTypes[$param->var->name] = $param->type->getAttribute('resolvedName')->name;
+                        $this->propertyTypes[$param->var->name] = NodeUtil::className($param->type);
                     }
                 }
             }
diff --git a/php-subsystem/src/Upgrade/TwoPointOh/JsonApi.php b/php-subsystem/src/Upgrade/TwoPointOh/JsonApi.php
@@ -48,7 +48,7 @@ function run(string $file, string $code, array $ast, array $data): ?ReplacementR
             public function enterNode(\PhpParser\Node $node)
             {
                 if ($node instanceof \PhpParser\Node\Stmt\Class_ && $node->extends) {
-                    if (in_array($node->extends->getAttribute('resolvedName')->name, self::STALE)) {
+                    if (in_array(NodeUtil::className($node->extends), self::STALE)) {
                         $node->setAttribute('comments', [new \PhpParser\Comment\Doc(<<<PHPDOC
                         /**
                          * @TODO: Remove this in favor of one of the API resource classes that were added.
@@ -145,7 +145,7 @@ public function enterNode(\PhpParser\Node $node)
             {
                 if ($node instanceof \PhpParser\Node\Expr\New_) {
                     if ($node->class instanceof \PhpParser\Node\Name) {
-                        $class = $node->class->getAttribute('resolvedName')->name;
+                        $class = NodeUtil::className($node->class);
 
                         if (in_array($class, ['Flarum\Extend\ApiSerializer', 'Flarum\Extend\ApiController', 'Flarum\Foundation\AbstractValidator'])) {
                             $parent = $node->getAttribute('parent');
diff --git a/php-subsystem/src/Upgrade/TwoPointOh/Search.php b/php-subsystem/src/Upgrade/TwoPointOh/Search.php
@@ -146,7 +146,7 @@ public function enterNode(Node $node)
                                 $expr = $node->stmts[0]->expr;
 
                                 if ($expr instanceof Node\Expr\StaticCall) {
-                                    $model = $expr->class->getAttribute('resolvedName')->name;
+                                    $model = NodeUtil::className($expr->class);
                                     $this->data['repositories'][$class]['model'] = $model;
                                 }
                             }
@@ -173,7 +173,7 @@ public function enterNode(Node $node)
                                 if ($expr instanceof Node\Expr\MethodCall && $expr->var instanceof Node\Expr\PropertyFetch && isset($this->map[$expr->var->name->name])) {
                                     $this->data['searchers'][$fqnClass]['repository'] = $this->map[$expr->var->name->name];
                                 } elseif ($expr instanceof Node\Expr\MethodCall && $expr->var instanceof Node\Expr\StaticCall) {
-                                    $model = $expr->var->class->getAttribute('resolvedName')->name;
+                                    $model = NodeUtil::className($expr->var->class);
                                     $this->data['searchers'][$fqnClass]['model'] = $model;
                                 }
                             }
@@ -271,7 +271,7 @@ public function leaveNode(Node $node)
                         }
 
                         if ($class === 'Flarum\Extend\Filter') {
-                            $filterer = $new->args[0]->value->class->getAttribute('resolvedName')->name;
+                            $filterer = NodeUtil::className($new->args[0]->value->class);
 
                             if ($filterer === 'Flarum\\Discussion\\Filter\\DiscussionFilterer') {
                                 $searcher = 'Flarum\\Discussion\\Search\\DiscussionSearcher';
@@ -297,7 +297,7 @@ public function leaveNode(Node $node)
                                 $this->data['searchers'][$searcher]['mutators'][] = $arg->value;
                             }
                         } elseif ($class === 'Flarum\Extend\SimpleFlarumSearch') {
-                            $searcher = $new->args[0]->value->class->getAttribute('resolvedName')->name;
+                            $searcher = NodeUtil::className($new->args[0]->value->class);
 
                             $arg = $node->args[0];
 

Original file line number	Diff line number	Diff line change
`@@ -69,4 +69,9 @@ public static function addUsesToNamespace(Node\Stmt\Namespace_ $node, array $use`
`69`	`69`	`array_splice($node->stmts, $lastUseStatement + 1, 0, $uses);`
`70`	`70`	`}`
`71`	`71`	`}`
	`72`	`+`
	`73`	`+ public static function className($expr): ?string`
	`74`	`+ {`
	`75`	`+ return $expr->getAttribute('resolvedName')?->name ?? $expr->name;`
	`76`	`+ }`
`72`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Flarum\CliPhpSubsystem\Upgrade\TwoPointOh;`
`4`	`4`
	`5`	`+use Flarum\CliPhpSubsystem\NodeUtil;`
`5`	`6`	`use Flarum\CliPhpSubsystem\NodeVisitors\ChangeSignatures;`
`6`	`7`	`use Flarum\CliPhpSubsystem\Upgrade\Replacement;`
`7`	`8`	`use Flarum\CliPhpSubsystem\Upgrade\ReplacementResult;`
`@@ -37,7 +38,7 @@ function run(string $file, string $code, array $ast, array $data): ?ReplacementR`
`37`	`38`
`38`	`39`	`public function enterNode(\PhpParser\Node $node)`
`39`	`40`	`{`
`40`		`- if ($node instanceof \PhpParser\Node\Stmt\Class_ && (!$node->implements \|\| ! in_array($this->interface, array_map(function ($interface) { return $interface->getAttribute('resolvedName')->name; }, $node->implements)))) {`
	`41`	`+ if ($node instanceof \PhpParser\Node\Stmt\Class_ && (!$node->implements \|\| ! in_array($this->interface, array_map(function ($interface) { return NodeUtil::className($interface); }, $node->implements)))) {`
`41`	`42`	`return NodeVisitor::DONT_TRAVERSE_CHILDREN;`
`42`	`43`	`}`
`43`	`44`
`@@ -53,7 +54,7 @@ public function enterNode(\PhpParser\Node $node)`
`53`	`54`
`54`	`55`	`public function leaveNode(Node $node)`
`55`	`56`	`{`
`56`		`- if ($node instanceof \PhpParser\Node\Stmt\Class_ && (!$node->implements \|\| ! in_array($this->interface, array_map(function ($interface) { return $interface->getAttribute('resolvedName')->name; }, $node->implements)))) {`
	`57`	`+ if ($node instanceof \PhpParser\Node\Stmt\Class_ && (!$node->implements \|\| ! in_array($this->interface, array_map(function ($interface) { return NodeUtil::className($interface); }, $node->implements)))) {`
`57`	`58`	`return NodeVisitor::STOP_TRAVERSAL;`
`58`	`59`	`}`
`59`	`60`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public function enterNode(Node $node)`
`146`	`146`	`$expr = $node->stmts[0]->expr;`
`147`	`147`
`148`	`148`	`if ($expr instanceof Node\Expr\StaticCall) {`
`149`		`- $model = $expr->class->getAttribute('resolvedName')->name;`
	`149`	`+ $model = NodeUtil::className($expr->class);`
`150`	`150`	`$this->data['repositories'][$class]['model'] = $model;`
`151`	`151`	`}`
`152`	`152`	`}`
`@@ -173,7 +173,7 @@ public function enterNode(Node $node)`
`173`	`173`	`if ($expr instanceof Node\Expr\MethodCall && $expr->var instanceof Node\Expr\PropertyFetch && isset($this->map[$expr->var->name->name])) {`
`174`	`174`	`$this->data['searchers'][$fqnClass]['repository'] = $this->map[$expr->var->name->name];`
`175`	`175`	`} elseif ($expr instanceof Node\Expr\MethodCall && $expr->var instanceof Node\Expr\StaticCall) {`
`176`		`- $model = $expr->var->class->getAttribute('resolvedName')->name;`
	`176`	`+ $model = NodeUtil::className($expr->var->class);`
`177`	`177`	`$this->data['searchers'][$fqnClass]['model'] = $model;`
`178`	`178`	`}`
`179`	`179`	`}`
`@@ -271,7 +271,7 @@ public function leaveNode(Node $node)`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`if ($class === 'Flarum\Extend\Filter') {`
`274`		`- $filterer = $new->args[0]->value->class->getAttribute('resolvedName')->name;`
	`274`	`+ $filterer = NodeUtil::className($new->args[0]->value->class);`
`275`	`275`
`276`	`276`	`if ($filterer === 'Flarum\\Discussion\\Filter\\DiscussionFilterer') {`
`277`	`277`	`$searcher = 'Flarum\\Discussion\\Search\\DiscussionSearcher';`
`@@ -297,7 +297,7 @@ public function leaveNode(Node $node)`
`297`	`297`	`$this->data['searchers'][$searcher]['mutators'][] = $arg->value;`
`298`	`298`	`}`
`299`	`299`	`} elseif ($class === 'Flarum\Extend\SimpleFlarumSearch') {`
`300`		`- $searcher = $new->args[0]->value->class->getAttribute('resolvedName')->name;`
	`300`	`+ $searcher = NodeUtil::className($new->args[0]->value->class);`
`301`	`301`
`302`	`302`	`$arg = $node->args[0];`
`303`	`303`