Skip to content

Fix ordered attributes #32

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
joshbruce merged 2 commits into from
Aug 20, 2026
Merged

Fix ordered attributes #32

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
5929ddd
fix: Ordered attributes
joshbruce Aug 20, 2026
329b1d3
update: Order attr expected output
joshbruce Aug 20, 2026
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
60 changes: 25 additions & 35 deletions src/Element.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,58 +58,48 @@ protected function omitEndTagClosingString(): string

protected function propertiesString(): string
{
if (count($this->properties()) === 0) {
if ($this->properties() === []) {
return '';
}

$orderedAttributes = array_fill_keys(static::ORDERED, "");
$otherAttributes = [];
$booleanAttributes = [];
$ordered = [];
$other = [];
$boolean = [];

$build = [];
foreach ($this->properties() as $property) {
if (strlen($property) === 0) {
[$attr, $value] = array_pad(explode(' ', $property, 2), 2, '');

if ($value === '') {
continue;
}

list($attr, $content) = explode(' ', $property, 2);

if (strlen($content) > 0) {
if (array_key_exists($attr, $orderedAttributes)) {
$orderedAttributes[$attr] = $content;

} elseif ($attr === $content) {
$booleanAttributes[$attr] = $content;

} else {
$otherAttributes[$attr] = $content;

}
if (in_array($attr, self::ORDERED, true)) {
$ordered[$attr] = $value;
} elseif ($attr === $value) {
$boolean[$attr] = true;
} else {
$other[$attr] = $value;
}
}

$orderedAttributes = array_filter($orderedAttributes, fn($c) => strlen($c) > 0);
$parts = [];

ksort($otherAttributes);

ksort($booleanAttributes);

$b = [];
foreach ($orderedAttributes as $prop => $content) {
$b[] = $prop . '="' . $content . '"';
foreach (self::ORDERED as $attr) {
if (isset($ordered[$attr])) {
$parts[] = $attr . '="' . $ordered[$attr] . '"';
}
}

foreach ($otherAttributes as $prop => $content) {
$b[] = $prop . '="' . $content . '"';
ksort($other);
foreach ($other as $attr => $value) {
$parts[] = $attr . '="' . $value . '"';
}

foreach ($booleanAttributes as $prop => $content) {
$b[] = $prop;
ksort($boolean);
foreach (array_keys($boolean) as $attr) {
$parts[] = $attr;
}

if (count($b) === 0) {
return '';
}
return ' ' . implode(' ', $b);
return $parts === [] ? '' : ' ' . implode(' ', $parts);
}
}
5 changes: 3 additions & 2 deletions tests/ElementExtensionBaselineTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@ class ElementExtensionBaselineTest extends TestCase
public function has_ordered_properties(): void // phpcs:ignore
{
$exptected = <<<html
<a class="some-style" href="https://8fold.pro" id="unique" data-testing="test" required>link</a>
<a is="link" id="unique" class="some-style" href="https://8fold.pro" data-testing="test" required>link</a>
html;

$result = (string) ElementExtension::a('link')->props(
'required required',
'href https://8fold.pro',
'class some-style',
'id unique',
'data-testing test'
'data-testing test',
'is link'
);

$this->assertSame($exptected, $result);
Expand Down
Loading