diff --git a/src/Illuminate/Foundation/Console/EnumMakeCommand.php b/src/Illuminate/Foundation/Console/EnumMakeCommand.php index fab08bb9433a..a3b4b278b76c 100644 --- a/src/Illuminate/Foundation/Console/EnumMakeCommand.php +++ b/src/Illuminate/Foundation/Console/EnumMakeCommand.php @@ -58,7 +58,7 @@ protected function resolveStubPath($stub) { return file_exists($customPath = $this->laravel->basePath(trim($stub, '/'))) ? $customPath - : __DIR__.$stub; + : __DIR__ . $stub; } /** @@ -70,9 +70,9 @@ protected function resolveStubPath($stub) protected function getDefaultNamespace($rootNamespace) { return match (true) { - is_dir(app_path('Enums')) => $rootNamespace.'\\Enums', - is_dir(app_path('Enumerations')) => $rootNamespace.'\\Enumerations', - default => $rootNamespace, + is_dir(app_path('Enums')) => $rootNamespace . '\\Enums', + is_dir(app_path('Enumerations')) => $rootNamespace . '\\Enumerations', + default => $rootNamespace . '\\Enums', }; } diff --git a/tests/Integration/Generators/EnumMakeCommandTest.php b/tests/Integration/Generators/EnumMakeCommandTest.php index 0aba736c80e5..edb72a8b08c7 100644 --- a/tests/Integration/Generators/EnumMakeCommandTest.php +++ b/tests/Integration/Generators/EnumMakeCommandTest.php @@ -7,9 +7,9 @@ class EnumMakeCommandTest extends TestCase { protected $files = [ - 'app/IntEnum.php', - 'app/StatusEnum.php', - 'app/StringEnum.php', + 'app/Enums/IntEnum.php', + 'app/Enums/StatusEnum.php', + 'app/Enums/StringEnum.php', 'app/*/OrderStatusEnum.php', ]; @@ -19,9 +19,9 @@ public function testItCanGenerateEnumFile() ->assertExitCode(0); $this->assertFileContains([ - 'namespace App;', + 'namespace App\Enums;', 'enum StatusEnum', - ], 'app/StatusEnum.php'); + ], 'app/Enums/StatusEnum.php'); } public function testItCanGenerateEnumFileWithString() @@ -30,9 +30,9 @@ public function testItCanGenerateEnumFileWithString() ->assertExitCode(0); $this->assertFileContains([ - 'namespace App;', + 'namespace App\Enums;', 'enum StringEnum: string', - ], 'app/StringEnum.php'); + ], 'app/Enums/StringEnum.php'); } public function testItCanGenerateEnumFileWithInt() @@ -41,9 +41,9 @@ public function testItCanGenerateEnumFileWithInt() ->assertExitCode(0); $this->assertFileContains([ - 'namespace App;', + 'namespace App\Enums;', 'enum IntEnum: int', - ], 'app/IntEnum.php'); + ], 'app/Enums/IntEnum.php'); } public function testItCanGenerateEnumFileInEnumsFolder()