Preserve sub-namespace when generating Entity from Model (--return=entity)

Author: xgrind

system/Commands/Generators/ModelGenerator.php

@@ -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}'";
         }