Skip to content

[11.x] Handle HtmlString constructed with a null #53367

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
merged 1 commit into from
Nov 1, 2024
Merged

[11.x] Handle HtmlString constructed with a null #53367

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/Illuminate/Support/HtmlString.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function toHtml()
*/
public function isEmpty()
{
return $this->html === '';
return ($this->html ?? '') === '';
}

/**
Expand All @@ -62,6 +62,6 @@ public function isNotEmpty()
*/
public function __toString()
{
return $this->toHtml();
return $this->toHtml() ?? '';
}
}
7 changes: 7 additions & 0 deletions tests/Support/SupportHtmlStringTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,20 @@ public function testToString()
$str = '<h1>foo</h1>';
$html = new HtmlString('<h1>foo</h1>');
$this->assertEquals($str, (string) $html);

// Check if HtmlString gracefully handles a null value
$html = new HtmlString(null);
$this->assertIsString((string) $html);
}

public function testIsEmpty(): void
{
// Check if HtmlString correctly identifies an empty string as empty
$this->assertTrue((new HtmlString(''))->isEmpty());

// Check if HtmlString identifies a null value as empty
$this->assertTrue((new HtmlString(null))->isEmpty());

// HtmlString with whitespace should not be considered as empty
$this->assertFalse((new HtmlString(' '))->isEmpty());

Expand Down