Skip to content

fix: Preserve sub-namespace when generating Entity from Model (--return=entity) #10232

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

Open
xgrind wants to merge 2 commits into
base: develop
Choose a base branch
from
+38 −6
Open

fix: Preserve sub-namespace when generating Entity from Model (--return=entity) #10232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c74ff7
Preserve sub-namespace when generating Entity from Model (--return=en…
xgrind May 22, 2026
b618dcf
test: add test for preserving sub-namespace in entity generation
xgrind May 24, 2026
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
17 changes: 11 additions & 6 deletions system/Commands/Generators/ModelGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,18 +114,23 @@ protected function prepare(string $class): string
}

if ($return === 'entity') {
$return = str_replace('Models', 'Entities', $class);
// Build the fully-qualified entity class from the model class so
// that the generated Entity keeps any sub-namespaces (eg. Admin).
$entityClass = str_replace('Models', 'Entities', $class);

if (preg_match('/^(\S+)Model$/i', $return, $match) === 1) {
$return = $match[1];
if (preg_match('/^(\S+)Model$/i', $entityClass, $match) === 1) {
$entityClass = $match[1];

if ($this->getOption('suffix')) {
$return .= 'Entity';
$entityClass .= 'Entity';
}
}

$return = '\\' . trim($return, '\\') . '::class';
$this->call('make:entity', array_merge([$baseClass], $this->params));
// Call the entity generator with the fully-qualified class name so
// it ends up under the correct sub-namespace/folder (eg. Admin).
$this->call('make:entity', array_merge([trim($entityClass, '\\')], $this->params));

$return = '\\' . trim($entityClass, '\\') . '::class';
} else {
$return = "'{$return}'";
}
Expand Down
27 changes: 27 additions & 0 deletions tests/system/Commands/Generators/ModelGeneratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,33 @@ public function testGenerateModelWithOptionSuffix(): void
rmdir(dirname($entity));
}

public function testGenerateModelWithSubNamespaceAndReturnEntity(): void
{
command('make:model admin/class --return entity');

$model = APPPATH . 'Models/Admin/Class.php';
$entity = APPPATH . 'Entities/Admin/Class.php';

$this->assertFileExists($model);
$this->assertFileExists($entity);

if (is_file($model)) {
unlink($model);
}
$modelDir = dirname($model);
if (is_dir($modelDir)) {
rmdir($modelDir);
}

if (is_file($entity)) {
unlink($entity);
}
$entityDir = dirname($entity);
if (is_dir($entityDir)) {
rmdir($entityDir);
}
}

/**
* @see https://github.com/codeigniter4/CodeIgniter4/issues/5050
*/
Expand Down
Loading