Skip to content

Commit a7e6562

Browse files
Support the dot in the make:volt command (#140)
* Support the dot in the make:volt command * Account for failingh test cases * Update MakeCommand.php --------- Co-authored-by: Taylor Otwell <[email protected]>
1 parent 0ab9d34 commit a7e6562

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

src/Console/MakeCommand.php

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,15 @@ protected function getPath($name): string
4848

4949
$mountPath = isset($paths[0]) ? $paths[0]->path : config('livewire.view_path', resource_path('views/livewire'));
5050

51-
return $mountPath.'/'.Str::lower(Str::finish($this->argument('name'), '.blade.php'));
51+
$argumentName = $this->argument('name');
52+
53+
if (! str_contains($argumentName, '.blade.php')) {
54+
$view = str_replace('.', '/', $argumentName);
55+
} else {
56+
$view = $argumentName;
57+
}
58+
59+
return $mountPath.'/'.Str::lower(Str::finish($view, '.blade.php'));
5260
}
5361

5462
/**
@@ -184,7 +192,15 @@ protected function getTestPath(): string
184192
*/
185193
protected function fullyQualifiedTestName(): string
186194
{
187-
$name = Str::of(Str::lower($this->argument('name')))->replace('.blade.php', '');
195+
$argumentName = $this->argument('name');
196+
197+
if (! str_contains($argumentName, '.blade.php')) {
198+
$processedName = str_replace('.', '/', $argumentName);
199+
} else {
200+
$processedName = $argumentName;
201+
}
202+
203+
$name = Str::of(Str::lower($processedName))->replace('.blade.php', '');
188204

189205
$namespacedName = Str::of(
190206
Str::of($name)

tests/Feature/Console/MakeCommandTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
})->with([
3434
['index', 'index.blade.php', 'IndexTest.php'],
3535
['chirps/index', 'chirps/index.blade.php', 'Chirps/IndexTest.php'],
36+
['chirps.index', 'chirps/index.blade.php', 'Chirps/IndexTest.php'],
3637
['chirps-index.blade.php', 'chirps-index.blade.php', 'ChirpsIndexTest.php'],
3738
['chirps_index.blade.php', 'chirps_index.blade.php', 'ChirpsIndexTest.php'],
3839
['chirps/index.blade.php', 'chirps/index.blade.php', 'Chirps/IndexTest.php'],
@@ -73,6 +74,7 @@ public function test_it_can_render(): void
7374
})->with([
7475
['index', 'index', 'index.blade.php', '', 'IndexTest', 'IndexTest.php'],
7576
['chirps/index', 'chirps.index', 'chirps/index.blade.php', '\Chirps', 'IndexTest', 'Chirps/IndexTest.php'],
77+
['chirps.index', 'chirps.index', 'chirps/index.blade.php', '\Chirps', 'IndexTest', 'Chirps/IndexTest.php'],
7678
['chirps_index.blade.php', 'chirps_index', 'chirps_index.blade.php', '', 'ChirpsIndexTest', 'ChirpsIndexTest.php'],
7779
['chirps-index.blade.php', 'chirps-index', 'chirps-index.blade.php', '', 'ChirpsIndexTest', 'ChirpsIndexTest.php'],
7880
['chirps/index.blade.php', 'chirps.index', 'chirps/index.blade.php', '\Chirps', 'IndexTest', 'Chirps/IndexTest.php'],
@@ -106,6 +108,7 @@ public function test_it_can_render(): void
106108
})->with([
107109
['index', 'index', 'index.blade.php', '', 'IndexTest', 'IndexTest.php'],
108110
['chirps/index', 'chirps.index', 'chirps/index.blade.php', '\Chirps', 'IndexTest', 'Chirps/IndexTest.php'],
111+
['chirps.index', 'chirps.index', 'chirps/index.blade.php', '\Chirps', 'IndexTest', 'Chirps/IndexTest.php'],
109112
['chirps_index.blade.php', 'chirps_index', 'chirps_index.blade.php', '', 'ChirpsIndexTest', 'ChirpsIndexTest.php'],
110113
['chirps-index.blade.php', 'chirps-index', 'chirps-index.blade.php', '', 'ChirpsIndexTest', 'ChirpsIndexTest.php'],
111114
['chirps/index.blade.php', 'chirps.index', 'chirps/index.blade.php', '\Chirps', 'IndexTest', 'Chirps/IndexTest.php'],

0 commit comments

Comments
 (0)