Skip to content
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

Jump to bottom

Move whitespace in front of verbatim block in Blade templates #51195

Merged
merged 1 commit into from
Apr 24, 2024
Merged

Move whitespace in front of verbatim block in Blade templates #51195

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/View/Compilers/BladeCompiler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,8 @@ protected function storeUncompiledBlocks($value)
*/
protected function storeVerbatimBlocks($value)
{
return preg_replace_callback('/(?<!@)@verbatim(.*?)@endverbatim/s', function ($matches) {
return $this->storeRawBlock($matches[1]);
return preg_replace_callback('/(?<!@)@verbatim(\s*)(.*?)@endverbatim/s', function ($matches) {
return $matches[1].$this->storeRawBlock($matches[2]);
}, $value);
}

Expand Down
15 changes: 15 additions & 0 deletions tests/View/Blade/BladeVerbatimTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,19 @@ public function testRawBlocksDontGetMixedUpWhenSomeAreRemovedByBladeComments()

$this->assertSame($expected, $this->compiler->compileString($string));
}

public function testNewlinesAreInsertedCorrectlyAfterEcho()
{
$string = "test @verbatim\nhello world\n@endverbatim";
$expected = "test \nhello world\n";
$this->assertSame($expected, $this->compiler->compileString($string));

$string = "{{ 1 }}\nhello world\n";
$expected = "<?php echo e(1); ?>\n\nhello world\n";
$this->assertSame($expected, $this->compiler->compileString($string));

$string = "{{ 1 }}@verbatim\nhello world\n@endverbatim";
$expected = "<?php echo e(1); ?>\n\nhello world\n";
$this->assertSame($expected, $this->compiler->compileString($string));
}
}