Try again.

lunarstorm · Nov 9, 2024 · 4943a94 · 4943a94
1 parent 44afc19
commit 4943a94
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/src/Commands/DomainControllerMakeCommand.php b/src/Commands/DomainControllerMakeCommand.php
@@ -62,21 +62,21 @@ protected function buildFormRequestReplacements(array $replace, $modelClass)
             );
         }
 
-        $namespacedRequests = $namespace.'\\'.$storeRequestClass.';';
+        $namespacedRequests = $namespace . '\\' . $storeRequestClass . ';';
 
         if ($storeRequestClass !== $updateRequestClass) {
-            $namespacedRequests .= PHP_EOL.'use '.$namespace.'\\'.$updateRequestClass.';';
+            $namespacedRequests .= PHP_EOL . 'use ' . $namespace . '\\' . $updateRequestClass . ';';
         }
 
         return array_merge($replace, [
             '{{ storeRequest }}' => $storeRequestClass,
             '{{storeRequest}}' => $storeRequestClass,
             '{{ updateRequest }}' => $updateRequestClass,
             '{{updateRequest}}' => $updateRequestClass,
-            '{{ namespacedStoreRequest }}' => $namespace.'\\'.$storeRequestClass,
-            '{{namespacedStoreRequest}}' => $namespace.'\\'.$storeRequestClass,
-            '{{ namespacedUpdateRequest }}' => $namespace.'\\'.$updateRequestClass,
-            '{{namespacedUpdateRequest}}' => $namespace.'\\'.$updateRequestClass,
+            '{{ namespacedStoreRequest }}' => $namespace . '\\' . $storeRequestClass,
+            '{{namespacedStoreRequest}}' => $namespace . '\\' . $storeRequestClass,
+            '{{ namespacedUpdateRequest }}' => $namespace . '\\' . $updateRequestClass,
+            '{{namespacedUpdateRequest}}' => $namespace . '\\' . $updateRequestClass,
             '{{ namespacedRequests }}' => $namespacedRequests,
             '{{namespacedRequests}}' => $namespacedRequests,
         ]);
@@ -92,8 +92,8 @@ protected function buildClass($name)
 
         $replace = [];
 
-        // Ensure invalid import is stripped (needed for Laravel 10)
-        $replace["use {$this->getNamespace($name)}\Controller;\n"] = '';
+        // Ensure invalid artifacts are stripped (Laravel 10 compatibility)
+        $replace["use {$this->rootNamespace()}Http\Controllers\Controller;\n"] = '';
 
         $appRootNamespace = $this->laravel->getNamespace();
         $pathToAppBaseController = parent::getPath("Http\Controllers\Controller");
@@ -105,8 +105,6 @@ protected function buildClass($name)
             $replace["\nclass {$controllerClass}\n"] = "\nuse {$appRootNamespace}Http\Controllers\Controller;\n\nclass {$controllerClass} extends Controller\n";
         } else {
             $replace[' extends Controller'] = '';
-            $rootNamespace = $this->rootNamespace();
-            $replace["use {$rootNamespace}Http\Controllers\Controller;\n"] = '';
         }
 
         $stub = str_replace(