Remove base controller if it doesn't exist (#49902)

* remove base controller if it doesn't exist * Apply fixes from StyleCI --------- Co-authored-by: StyleCI Bot <[email protected]>
laravel · Jan 29, 2024 · bc753cf · bc753cf
1 parent b63a4e6
commit bc753cf
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/src/Illuminate/Routing/Console/ControllerMakeCommand.php b/src/Illuminate/Routing/Console/ControllerMakeCommand.php
@@ -110,6 +110,7 @@ protected function getDefaultNamespace($rootNamespace)
      */
     protected function buildClass($name)
     {
+        $rootNamespace = $this->rootNamespace();
         $controllerNamespace = $this->getNamespace($name);
 
         $replace = [];
@@ -126,11 +127,20 @@ protected function buildClass($name)
             $replace['abort(404);'] = '//';
         }
 
-        $replace["use {$controllerNamespace}\Controller;\n"] = '';
+        $baseControllerExists = class_exists($rootNamespace.'Http\Controllers\Controller');
 
-        return str_replace(
+        if ($baseControllerExists) {
+            $replace["use {$controllerNamespace}\Controller;\n"] = '';
+        } else {
+            $replace[' extends Controller'] = '';
+            $replace["use {$rootNamespace}Http\Controllers\Controller;\n"] = '';
+        }
+
+        $class = str_replace(
             array_keys($replace), array_values($replace), parent::buildClass($name)
         );
+
+        return $class;
     }
 
     /**

diff --git a/tests/Integration/Generators/ControllerMakeCommandTest.php b/tests/Integration/Generators/ControllerMakeCommandTest.php
@@ -19,7 +19,7 @@ public function testItCanGenerateControllerFile()
         $this->assertFileContains([
             'namespace App\Http\Controllers;',
             'use Illuminate\Http\Request;',
-            'class FooController extends Controller',
+            'class FooController',
         ], 'app/Http/Controllers/FooController.php');
 
         $this->assertFileNotContains([
@@ -37,7 +37,7 @@ public function testItCanGenerateControllerFileWithInvokableTypeOption()
         $this->assertFileContains([
             'namespace App\Http\Controllers;',
             'use Illuminate\Http\Request;',
-            'class FooController extends Controller',
+            'class FooController',
             'public function __invoke(Request $request)',
         ], 'app/Http/Controllers/FooController.php');
     }
@@ -50,7 +50,7 @@ public function testItCanGenerateControllerFileWithInvokableOption()
         $this->assertFileContains([
             'namespace App\Http\Controllers;',
             'use Illuminate\Http\Request;',
-            'class FooController extends Controller',
+            'class FooController',
             'public function __invoke(Request $request)',
         ], 'app/Http/Controllers/FooController.php');
     }
@@ -103,7 +103,7 @@ public function testItCanGenerateControllerFileWithApiOption()
         $this->assertFileContains([
             'namespace App\Http\Controllers;',
             'use Illuminate\Http\Request;',
-            'class FooController extends Controller',
+            'class FooController',
             'public function index()',
             'public function store(Request $request)',
             'public function update(Request $request, string $id)',
@@ -124,7 +124,7 @@ public function testItCanGenerateControllerFileWithInvokableIgnoresApiOption()
         $this->assertFileContains([
             'namespace App\Http\Controllers;',
             'use Illuminate\Http\Request;',
-            'class FooController extends Controller',
+            'class FooController',
             'public function __invoke(Request $request)',
         ], 'app/Http/Controllers/FooController.php');
 

diff --git a/tests/Integration/Generators/ModelMakeCommandTest.php b/tests/Integration/Generators/ModelMakeCommandTest.php
@@ -69,7 +69,7 @@ public function testItCanGenerateModelFileWithControllerOption()
         $this->assertFileContains([
             'namespace App\Http\Controllers;',
             'use Illuminate\Http\Request;',
-            'class FooController extends Controller',
+            'class FooController',
         ], 'app/Http/Controllers/FooController.php');
 
         $this->assertFileNotContains([
@@ -156,7 +156,7 @@ public function testItCanGenerateNestedModelFileWithControllerOption()
         $this->assertFileContains([
             'namespace App\Http\Controllers;',
             'use Illuminate\Http\Request;',
-            'class BarController extends Controller',
+            'class BarController',
         ], 'app/Http/Controllers/BarController.php');
 
         $this->assertFilenameNotExists('database/factories/FooFactory.php');