Skip to content

fix(attribute): process Attribute nodes in leaveNode for cross-file enum resolution #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yuan-dian wants to merge 1 commit into from
Closed

fix(attribute): process Attribute nodes in leaveNode for cross-file enum resolution #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 29 additions & 27 deletions src/Transform/RuntimeAttributeFactoryLowering.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,30 +78,6 @@ public function enterNode(Node $node): null
return null;
}

if (!$node instanceof Node\Attribute) {
return null;
}
if (CompileTimeAttributeRegistry::get($node->name->toString()) !== null) {
return null;
}

foreach ($node->args as $argument) {
if (!$this->requiresFactory($argument->value)) {
continue;
}

$factory = $this->createFactory($argument->value);
$argument->value->setAttribute(self::FACTORY_NAME_ATTRIBUTE, $factory['fullName']);
if ($this->requiresLazyValue($argument->value)) {
$argument->value->setAttribute(self::FACTORY_LAZY_VALUE_ATTRIBUTE, true);
}
if ($this->namespaceFactories !== []) {
$index = array_key_last($this->namespaceFactories);
$this->namespaceFactories[$index][] = $factory['node'];
} else {
$this->globalFactories[] = $factory['node'];
}
}
return null;
}

Expand All @@ -115,6 +91,33 @@ public function leaveNode(Node $node): null
array_push($node->stmts, ...$factories);
}
$this->namespace = '';
} elseif ($node instanceof Node\Attribute) {
// Process attribute args in leaveNode so that NameResolver has
// already resolved all Name nodes in the argument expressions.
// Using enterNode would see unresolved Name('IdType') instead of
// Name\FullyQualified('App\\Enums\\IdType'), causing enum case
// detection to fail for cross-file enums.
if (CompileTimeAttributeRegistry::get($node->name->toString()) !== null) {
return null;
}

foreach ($node->args as $argument) {
if (!$this->requiresFactory($argument->value)) {
continue;
}

$factory = $this->createFactory($argument->value);
$argument->value->setAttribute(self::FACTORY_NAME_ATTRIBUTE, $factory['fullName']);
if ($this->requiresLazyValue($argument->value)) {
$argument->value->setAttribute(self::FACTORY_LAZY_VALUE_ATTRIBUTE, true);
}
if ($this->namespaceFactories !== []) {
$index = array_key_last($this->namespaceFactories);
$this->namespaceFactories[$index][] = $factory['node'];
} else {
$this->globalFactories[] = $factory['node'];
}
}
}
return null;
}
Expand Down Expand Up @@ -271,9 +274,8 @@ public function enterNode(Node $node): ?Node
}
}
if ($node instanceof Node\Name) {
// Attribute factories are created while the outer
// traverser is entering the Attribute node, before its
// argument names have been visited by NameResolver.
// Attribute factories are created in leaveNode after
// NameResolver has resolved all Name nodes.
if ($node instanceof Node\Name\Relative) {
$name = ltrim($this->namespace . '\\' . $node->toString(), '\\');
return new Node\Name\FullyQualified($name, $node->getAttributes());
Expand Down
Loading