Skip to content

fix: make:enum creates Enums directory if none exists #59334

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

Closed
Waris10 wants to merge 1 commit into from
+13 −13
Closed

fix: make:enum creates Enums directory if none exists #59334

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
8 changes: 4 additions & 4 deletions src/Illuminate/Foundation/Console/EnumMakeCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ protected function resolveStubPath($stub)
{
return file_exists($customPath = $this->laravel->basePath(trim($stub, '/')))
? $customPath
: __DIR__.$stub;
: __DIR__ . $stub;
}

/**
Expand All @@ -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',
};
}

Expand Down
18 changes: 9 additions & 9 deletions tests/Integration/Generators/EnumMakeCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
];

Expand All @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand Down
Loading