Skip to content

Fix for placeholder default block #96

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
LukeTowers merged 2 commits into from
Jul 12, 2022
Merged

Fix for placeholder default block #96

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
c964013
restore previous default value for BlockBuilder placeholder/get methods
mjauvin Jul 12, 2022
84edabb
add unit test for Block::get
mjauvin Jul 12, 2022
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/Html/BlockBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public function append(string $name, string $content): void
*
* If the block does not exist, then the `$default` content will be returned instead.
*/
public function placeholder(string $name, string $default = ''): string
public function placeholder(string $name, string $default = null): ?string
{
$result = $this->get($name, $default);
unset($this->blocks[$name]);
Expand All @@ -120,7 +120,7 @@ public function placeholder(string $name, string $default = ''): string
*
* If the block does not exist, then the `$default` content will be returned instead.
*/
public function get(string $name, string $default = ''): string
public function get(string $name, string $default = null): ?string
{
if (!isset($this->blocks[$name])) {
return $default;
Expand Down
9 changes: 9 additions & 0 deletions tests/Html/BlockBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,4 +229,13 @@ public function testContainBetweenBlocks()
);
$this->assertEquals('In between', $content);
}

public function testGetBlock()
{
$result = $this->Block->get('non-existent-block');
$this->assertNull($result);

$result = $this->Block->get('non-existent-block', 'default value');
$this->assertEquals('default value', $result);
}
}