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

[10.x] Add a missing semicolon to CompilesClasses #47280

Merged
merged 5 commits into from
May 30, 2023
Merged

[10.x] Add a missing semicolon to CompilesClasses #47280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86e989b
Add a missing semicolon to CompilesClasses
szepeviktor May 30, 2023
9c568e6
Fix testClassesAreConditionallyCompiledFromArray
szepeviktor May 30, 2023
46d141e
Fix testUnclosedParenthesisForBladeTags
szepeviktor May 30, 2023
ee297b6
Fix testNestedTagCalls
szepeviktor May 30, 2023
bce7651
Fix testNestedTagCalls again
szepeviktor May 30, 2023
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
2 changes: 1 addition & 1 deletion src/Illuminate/View/Compilers/Concerns/CompilesClasses.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ protected function compileClass($expression)
{
$expression = is_null($expression) ? '([])' : $expression;

return "class=\"<?php echo \Illuminate\Support\Arr::toCssClasses{$expression} ?>\"";
return "class=\"<?php echo \Illuminate\Support\Arr::toCssClasses{$expression}; ?>\"";
}
}
2 changes: 1 addition & 1 deletion tests/View/Blade/BladeClassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class BladeClassTest extends AbstractBladeTestCase
public function testClassesAreConditionallyCompiledFromArray()
{
$string = "<span @class(['font-bold', 'mt-4', 'ml-2' => true, 'mr-2' => false])></span>";
$expected = "<span class=\"<?php echo \Illuminate\Support\Arr::toCssClasses(['font-bold', 'mt-4', 'ml-2' => true, 'mr-2' => false]) ?>\"></span>";
$expected = "<span class=\"<?php echo \Illuminate\Support\Arr::toCssClasses(['font-bold', 'mt-4', 'ml-2' => true, 'mr-2' => false]); ?>\"></span>";

$this->assertEquals($expected, $this->compiler->compileString($string));
}
Expand Down
18 changes: 9 additions & 9 deletions tests/View/Blade/BladePhpStatementsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,12 @@ public function testStringWithEscapingDataValue()
public function testUnclosedParenthesisForBladeTags()
{
$string = "<span @class(['(']></span>";
$expected = "<span class=\"<?php echo \Illuminate\Support\Arr::toCssClasses([]) ?>\"(['(']></span>";
$expected = "<span class=\"<?php echo \Illuminate\Support\Arr::toCssClasses([]); ?>\"(['(']></span>";

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

$string = "<span @class(['']></span>";
$expected = "<span class=\"<?php echo \Illuminate\Support\Arr::toCssClasses([]) ?>\"(['']></span>";
$expected = "<span class=\"<?php echo \Illuminate\Support\Arr::toCssClasses([]); ?>\"(['']></span>";

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

Expand All @@ -145,31 +145,31 @@ public function testUnclosedParenthesisForBladeTags()
public function testNestedTagCalls()
{
$string = "<span @class(['k' => @empty(\$v)])></span>";
$expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v)]) ?>"></span>';
$expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v)]); ?>"></span>';
$this->assertEquals($expected, $this->compiler->compileString($string));

$string = "<span @class(['k))' => @empty(\$v)])></span>";
$expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k))\' => @empty($v)]) ?>"></span>';
$expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k))\' => @empty($v)]); ?>"></span>';
$this->assertEquals($expected, $this->compiler->compileString($string));

$string = "<span @class(['k' => @empty(\$v), 't' => @empty(\$v1)])></span>";
$expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t\' => @empty($v1)]) ?>"></span>';
$expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t\' => @empty($v1)]); ?>"></span>';
$this->assertEquals($expected, $this->compiler->compileString($string));

$string = "<span @class(['k' => @empty(\$v), 't' => @empty(\$v1)])></span>";
$expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t\' => @empty($v1)]) ?>"></span>';
$expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t\' => @empty($v1)]); ?>"></span>';
$this->assertEquals($expected, $this->compiler->compileString($string));

$string = "<span @class(['k' => @empty(\$v), 't' => @empty(\$v1), 'r' => @empty(\$v2)])></span>";
$expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t\' => @empty($v1), \'r\' => @empty($v2)]) ?>"></span>';
$expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t\' => @empty($v1), \'r\' => @empty($v2)]); ?>"></span>';
$this->assertEquals($expected, $this->compiler->compileString($string));

$string = "<span @class(['k' => @empty(\$v), 't))' => @empty(\$v1), 'r' => @empty(\$v2)])></span>";
$expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t))\' => @empty($v1), \'r\' => @empty($v2)]) ?>"></span>';
$expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t))\' => @empty($v1), \'r\' => @empty($v2)]); ?>"></span>';
$this->assertEquals($expected, $this->compiler->compileString($string));

$string = "<span @class(['k' => @empty(\$v), 't' => @empty(\$v1), 'r' => @empty(\$v2), 'l' => 'l'])></span><span @class(['k' => @empty(\$v)])></span>";
$expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t\' => @empty($v1), \'r\' => @empty($v2), \'l\' => \'l\']) ?>"></span><span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v)]) ?>"></span>';
$expected = '<span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v), \'t\' => @empty($v1), \'r\' => @empty($v2), \'l\' => \'l\']); ?>"></span><span class="<?php echo \Illuminate\Support\Arr::toCssClasses([\'k\' => @empty($v)]); ?>"></span>';
$this->assertEquals($expected, $this->compiler->compileString($string));
}

Expand Down