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

[9.x] Fix undefined constant error when use slot name as key of object #42943

Merged
merged 3 commits into from
Jun 27, 2022
Merged

[9.x] Fix undefined constant error when use slot name as key of object #42943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12ad201
modify name if inline name is not empty
monurakkaya Jun 23, 2022
3ccf644
styleci fix
monurakkaya Jun 24, 2022
26730ac
key of object of dynamic slot name tests added
monurakkaya Jun 24, 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
2 changes: 1 addition & 1 deletion src/Illuminate/View/Compilers/ComponentTagCompiler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ public function compileSlots(string $value)
$value = preg_replace_callback($pattern, function ($matches) {
$name = $this->stripQuotes($matches['inlineName'] ?: $matches['name']);

if (Str::contains($name, '-')) {
if (Str::contains($name, '-') && ! empty($matches['inlineName'])) {
$name = Str::camel($name);
}

Expand Down
8 changes: 8 additions & 0 deletions tests/View/Blade/BladeComponentTagCompilerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@ public function testDynamicSlotsCanBeCompiled()
$this->assertSame("@slot(\$foo, null, []) \n".' @endslot', trim($result));
}

public function testDynamicSlotsCanBeCompiledWithKeyOfObjects()
{
$result = $this->compiler()->compileSlots('<x-slot :name="$foo->name">
</x-slot>');

$this->assertSame("@slot(\$foo->name, null, []) \n".' @endslot', trim($result));
}

public function testSlotsWithAttributesCanBeCompiled()
{
$result = $this->compiler()->compileSlots('<x-slot name="foo" class="font-bold">
Expand Down