Skip to content

refactor(view): improve escaping, null handling, and error cases #1781

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

Open
xHeaven wants to merge 18 commits into
base: 3.x
Choose a base branch
from
+13 −6
Open

refactor(view): improve escaping, null handling, and error cases #1781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5a98a21
feat(core): support php 8.5 (#1733)
brendt Dec 3, 2025
0f63187
fix(core): gracefully handle missing seeders when using `db:seed` (#1…
xHeaven Dec 3, 2025
6dcb56f
fix(auth): pass scopes/options to auth URL builder (#1750)
xHeaven Dec 3, 2025
cebe571
fix(auth): update outdated authenticatable import (#1752)
xHeaven Dec 3, 2025
d99ded0
refactor(auth): remove double base url call (#1753)
xHeaven Dec 3, 2025
b80308e
feat(cache): make `assertLocked` ensure that the checked lock has an …
xHeaven Dec 3, 2025
6877cd2
fix(cache): add descriptions to `cache:clear` arguments (#1755)
xHeaven Dec 3, 2025
974e7bf
refactor(cache): several fixes and improvements for the cache package…
xHeaven Dec 3, 2025
3771463
fix(view): correct ArrayAccess::offsetExists in TokenCollection
xHeaven Dec 3, 2025
a3300e2
fix(view): handle invalid base64 in Slot content getter
xHeaven Dec 3, 2025
9e594a8
fix(view): add missing sprintf placeholder for scoped variables
xHeaven Dec 3, 2025
27cc963
fix(view): use ENT_QUOTES flag in escape method
xHeaven Dec 3, 2025
30ed8eb
fix(view): correct null handling in parser scope property
xHeaven Dec 3, 2025
f999b24
refactor(view): use named parameters
xHeaven Dec 3, 2025
b91d436
refactor(view): uses array_last to keep oneliner
xHeaven Dec 5, 2025
3e78077
Merge branch '3.x' into view
xHeaven Dec 12, 2025
eed3a45
trigger workflows
xHeaven Dec 14, 2025
35b25c3
fix(view): handle falsy values
xHeaven Dec 17, 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
7 changes: 5 additions & 2 deletions packages/view/src/Elements/ViewComponentElement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public function compile(): string
->prepend(
// Open the current scope
sprintf(
'<?php (function ($attributes, $slots, $scopedVariables %s %s) { extract($scopedVariables, EXTR_SKIP); ?>',
'<?php (function ($attributes, $slots, $scopedVariables %s %s %s) { extract($scopedVariables, EXTR_SKIP); ?>',
$this->dataAttributes->isNotEmpty() ? ', ' . $this->dataAttributes->map(fn (string $_value, string $key) => "\${$key}")->implode(', ') : '',
$this->expressionAttributes->isNotEmpty() ? ', ' . $this->expressionAttributes->map(fn (string $_value, string $key) => "\${$key}")->implode(', ') : '',
$this->scopedVariables->isNotEmpty() ? ', ' . $this->scopedVariables->map(fn (string $name) => "\${$name}")->implode(', ') : '',
Expand All @@ -150,7 +150,7 @@ public function compile(): string
->append(
// Close and call the current scope
sprintf(
'<?php })(attributes: %s, slots: %s, scopedVariables: [%s] + ($scopedVariables ?? $this->currentView?->data ?? []) %s %s) ?>',
'<?php })(attributes: %s, slots: %s, scopedVariables: [%s] + ($scopedVariables ?? $this->currentView?->data ?? []) %s %s %s) ?>',
ViewObjectExporter::export($this->viewComponentAttributes),
ViewObjectExporter::export($slots),
$this->scopedVariables->isNotEmpty()
Expand All @@ -162,6 +162,9 @@ public function compile(): string
$this->expressionAttributes->isNotEmpty()
? ', ' . $this->expressionAttributes->map(fn (mixed $value, string $key) => "{$key}: " . $value)->implode(', ')
: '',
$this->scopedVariables->isNotEmpty()
? ', ' . $this->scopedVariables->map(fn (string $name) => "{$name}: \${$name}")->implode(', ')
: '',
),
);

Expand Down
2 changes: 1 addition & 1 deletion packages/view/src/Parser/TempestViewParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ final class TempestViewParser
private array $scope = [];

private ?Token $currentScope {
get => $this->scope[array_key_last($this->scope) ?? ''] ?? null;
get => array_last($this->scope);
}

public function __construct(
Expand Down
2 changes: 1 addition & 1 deletion packages/view/src/Parser/TokenCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function __debugInfo(): array

public function offsetExists(mixed $offset): bool
{
return $this->tokens[$offset] ?? false;
return isset($this->tokens[$offset]);
}

public function offsetGet(mixed $offset): mixed
Expand Down
6 changes: 5 additions & 1 deletion packages/view/src/Renderers/TempestViewRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,11 @@ public function escape(null|string|HtmlString|Stringable $value): string
return (string) $value;
}

return htmlentities((string) $value);
return htmlentities(
string: (string) $value,
flags: ENT_QUOTES | ENT_SUBSTITUTE,
encoding: 'UTF-8',
);
}

private function validateView(View $view): void
Expand Down
2 changes: 1 addition & 1 deletion packages/view/src/Slot.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function __construct(
}

public string $content {
get => base64_decode($this->content, true);
get => ($d = base64_decode($this->content, strict: true)) === false ? '' : $d;
}

public ImmutableArray $exportData {
Expand Down