8000 Extract property hook bodies properly by xHeaven · Pull Request #172 · nette/php-generator · GitHub
[go: up one dir, main page]
Skip to content

Extract property hook bodies properly #172

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

Merged
dg merged 2 commits into from
Feb 17, 2025
Merged

Extract property hook bodies properly #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e204349
Extract property hook bodies properly
xHeaven Jan 23, 2025
e5a56dc
Replaced spaces with tabs as per coding standard
xHeaven Jan 23, 2025
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
23 changes: 23 additions & 0 deletions src/PhpGenerator/Extractor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,29 @@ public function extractMethodBodies(string $className): array
}


/** @return array<string, array<string, string>> */
public function extractPropertyHookBodies(string $className): array
{
$nodeFinder = new NodeFinder();
$classNode = $nodeFinder->findFirst(
$this->statements,
fn(Node $node) => $node instanceof Node\Stmt\ClassLike && $node->namespacedName->toString() === $className,
);

$res = [];
foreach ($nodeFinder->findInstanceOf($classNode, Node\Stmt\Property::class) as $propertyNode) {
foreach ($propertyNode->props as $propNode) {
$propName = $propNode->name->toString();
foreach ($propertyNode->hooks as $hookNode) {
$hookType = $hookNode->name->toString();
$res[$propName][$hookType] = $this->getReformattedContents([$hookNode->body], 1);
}
}
}
return $res;
}


public function extractFunctionBody(string $name): ?string
{
$functionNode = (new NodeFinder)->findFirst(
Expand Down
9 changes: 9 additions & 0 deletions src/PhpGenerator/Factory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,15 @@ public function fromClassReflection(
$resolutions = [];
}

if ($withBodies) {
$hookBodies = $this->getExtractor($declaringClass->getFileName())->extractPropertyHookBodies($declaringClass->name);
foreach ($class->getProperties() as $property) {
foreach ($hookBodies[$property->getName()] ?? [] as $hookType => $body) {
$property->getHook($hookType)?->setBody($body, short: true);
}
}
}

$consts = $cases = [];
foreach ($from->getReflectionConstants() as $const) {
if ($class->isEnum() && $from->hasCase($const->name)) {
Expand Down
0