Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 25 additions & 13 deletions src/Frame.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,17 @@ public function getRootNode(): self
return $node;
}

public function getName(): string
public function getName(bool $emptyParent = false): string
{
if ($this->parent && str_contains($this->name, '$parent')) {
$parent = $this;
$parentName = '';
while ($parent = $parent->getParent()) {
$parentName = $parent->getName();
if ($parentName) {
break;
if (!$emptyParent) {
while ($parent = $parent->getParent()) {
$parentName = $parent->getName();
if ($parentName) {
break;
}
}
}
return str_replace('$parent', $parentName, $this->name);
Expand All @@ -55,17 +57,16 @@ public function getName(): string

public function getClassName(): ?string
{
if ($this->getName() && $this->getRootNode()::class === Frame::class) {
return $this->sanitizeClassName($this->getName());
}
$prefix = $this->parent?->getClassName() ?? '';
$name = $this->getName() ?: $this->getParentKey();
if (!$name) {
$name = $this->getName(true) ?: $this->getParentKey();
if (!$name || ($this->parent && !$prefix)) {
return null;
}

return str_replace(
['$', ' ', '-', '.'],
['', '_', '_', '_'],
$prefix === '' ? $name : $prefix . '_' . $name,
);
return $this->sanitizeClassName($prefix === '' ? $name : ($prefix . '_' . $name));
}

public function getParent(): ?self
Expand Down Expand Up @@ -140,7 +141,9 @@ public function getInherits(): array
$inherits = (string) $this->xmlElement->attributes()['inherits'] ?? '';
$inherits = str_replace(' ', '', $inherits);

return $inherits === '' ? [] : explode(',', $inherits);
return $inherits === ''
? []
: array_map($this->sanitizeClassName(...), explode(',', $inherits));
}

/**
Expand Down Expand Up @@ -189,4 +192,13 @@ public function getLineNumber(): int

return $node->getLineNo();
}

private function sanitizeClassName(string $name): string
{
return str_replace(
['$', ' ', '-', '.', '!'],
['', '_', '_', '_', '_'],
$name,
);
}
}
8 changes: 4 additions & 4 deletions src/Registry.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
class Registry
{
/**
* @var T[]
* @var array<string, (T&Frame)>
*/
private array $items = [];

/**
* @param T $template
* @param T&Frame $template
*/
public function register(?string $name, Frame $template): void
{
Expand All @@ -27,15 +27,15 @@ public function register(?string $name, Frame $template): void
}

/**
* @return T|null
* @return (T&Frame)|null
*/
public function get(string $name): ?Frame
{
return $this->items[$name] ?? null;
}

/**
* @return T[]
* @return array<string, (T&Frame)>
*/
public function all(): array
{
Expand Down
2 changes: 1 addition & 1 deletion src/XmlFileParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ private function parseNode(SimpleXMLElement $node, Registry $fileRegistry, ?Fram
$this->frameRegistry->register($frame->getClassName(), $frame);
}
if (!empty($name)) {
$fileRegistry->register($name, $frame);
$fileRegistry->register($frame->getClassName(), $frame);
}
$parent?->addChild($frame);

Expand Down