Change controller name convention to singular

src/Generators/ControllerGenerator.php

@@ -12,7 +12,7 @@ class ControllerGenerator extends BaseGenerator
      */
     public function generate(string $type = 'full')
     {
-        $pluralModelName = $this->modelNames['plural_model_name'];
+        $modelName = $this->modelNames['model_name'];
         $parentControllerDirectory = '';
         if (!is_null($this->command->option('parent'))) {
             $parentControllerDirectory = '/'.$this->command->option('parent');
@@ -23,15 +23,15 @@ class ControllerGenerator extends BaseGenerator
         }
 
         $controllerPath = $this->makeDirectory(app_path('Http/Controllers'.$parentControllerDirectory));
-        $controllerPath = $controllerPath.'/'.$pluralModelName.'Controller.php';
+        $controllerPath = $controllerPath.'/'.$modelName.'Controller.php';
 
         $this->generateFile($controllerPath, $this->getContent('controllers/'.$type));
 
         if ($this->isForApi()) {
-            $pluralModelName = 'Api/'.$pluralModelName;
+            $modelName = 'Api/'.$modelName;
         }
 
-        $this->command->info($pluralModelName.'Controller generated.');
+        $this->command->info($modelName.'Controller generated.');
     }
 
     /**

src/Generators/RouteGenerator.php

@@ -29,11 +29,11 @@ class RouteGenerator extends BaseGenerator
         $webRouteFileContent = $this->replaceStubString($stub);
 
         if (!is_null($parentName = $this->command->option('parent'))) {
-            $pluralModelName = $this->modelNames['plural_model_name'];
+            $modelName = $this->modelNames['model_name'];
 
             $webRouteFileContent = str_replace(
-                $pluralModelName.'Controller',
-                $parentName.'\\'.$pluralModelName.'Controller',
+                $modelName.'Controller',
+                $parentName.'\\'.$modelName.'Controller',
                 $webRouteFileContent
             );
         }

src/stubs/controllers/api.stub

@@ -6,7 +6,7 @@ use fullMstr;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
-class MastersController extends Controller
+class MasterController extends Controller
 {
     /**
      * Get a listing of the singleMstr.

src/stubs/controllers/full.stub

@@ -5,7 +5,7 @@ namespace App\Http\Controllers;
 use fullMstr;
 use Illuminate\Http\Request;
 
-class MastersController extends Controller
+class MasterController extends Controller
 {
     /**
      * Display a listing of the singleMstr.

src/stubs/controllers/simple.stub

@@ -5,7 +5,7 @@ namespace App\Http\Controllers;
 use fullMstr;
 use Illuminate\Http\Request;
 
-class MastersController extends Controller
+class MasterController extends Controller
 {
     /**
      * Display a listing of the singleMstr.

src/stubs/routes/api.stub

@@ -2,4 +2,4 @@
 /*
  * Masters Endpoints
  */
-Route::middleware('auth:api')->resource('masters', 'Api\MastersController')->names('api.masters');
+Route::middleware('auth:api')->resource('masters', 'Api\MasterController')->names('api.masters');

src/stubs/routes/web.stub

@@ -2,4 +2,4 @@
 /*
  * Masters Routes
  */
-Route::resource('masters', 'MastersController');
+Route::resource('masters', 'MasterController');

tests/CrudApiMakeCommandTest.php

@@ -14,7 +14,7 @@ class CrudApiMakeCommandTest extends TestCase
         $this->assertNotContains("{$this->model_name} model already exists.", app(Kernel::class)->output());
 
         $this->assertFileExists(app_path($this->model_name.'.php'));
-        $this->assertFileExists(app_path("Http/Controllers/Api/{$this->plural_model_name}Controller.php"));
+        $this->assertFileExists(app_path("Http/Controllers/Api/{$this->model_name}Controller.php"));
 
         $migrationFilePath = database_path('migrations/'.date('Y_m_d_His').'_create_'.$this->table_name.'_table.php');
         $this->assertFileExists($migrationFilePath);
@@ -41,7 +41,7 @@ class CrudApiMakeCommandTest extends TestCase
         $this->assertContains("We will use existing {$this->model_name} model.", app(Kernel::class)->output());
 
         $this->assertFileExists(app_path($this->model_name.'.php'));
-        $this->assertFileExists(app_path("Http/Controllers/Api/{$this->plural_model_name}Controller.php"));
+        $this->assertFileExists(app_path("Http/Controllers/Api/{$this->model_name}Controller.php"));
 
         $migrationFilePath = database_path('migrations/'.date('Y_m_d_His').'_create_'.$this->table_name.'_table.php');
         $this->assertFileNotExists($migrationFilePath);
@@ -65,7 +65,7 @@ class CrudApiMakeCommandTest extends TestCase
         $this->assertContains("We will use existing Problem model.", app(Kernel::class)->output());
 
         $this->assertFileExists(app_path('Entities/Projects/Problem.php'));
-        $this->assertFileExists(app_path("Http/Controllers/Api/ProblemsController.php"));
+        $this->assertFileExists(app_path("Http/Controllers/Api/ProblemController.php"));
 
         $migrationFilePath = database_path('migrations/'.date('Y_m_d_His').'_create_problems_table.php');
         $this->assertFileNotExists($migrationFilePath);
@@ -101,7 +101,7 @@ class CrudApiMakeCommandTest extends TestCase
         $this->assertNotContains("{$modelName} model already exists.", app(Kernel::class)->output());
 
         $this->assertFileExists(app_path($modelPath.'/'.$modelName.'.php'));
-        $this->assertFileExists(app_path("Http/Controllers/Api/{$pluralModelName}Controller.php"));
+        $this->assertFileExists(app_path("Http/Controllers/Api/{$modelName}Controller.php"));
 
         $migrationFilePath = database_path('migrations/'.date('Y_m_d_His').'_create_'.$tableName.'_table.php');
         $this->assertFileExists($migrationFilePath);
@@ -134,7 +134,7 @@ class CrudApiMakeCommandTest extends TestCase
         $this->assertNotContains("{$modelName} model already exists.", app(Kernel::class)->output());
 
         $this->assertFileExists(app_path($modelPath.'/'.$modelName.'.php'));
-        $this->assertFileExists(app_path("Http/Controllers/Api/{$parentName}/{$pluralModelName}Controller.php"));
+        $this->assertFileExists(app_path("Http/Controllers/Api/{$parentName}/{$modelName}Controller.php"));
 
         $migrationFilePath = database_path('migrations/'.date('Y_m_d_His').'_create_'.$tableName.'_table.php');
         $this->assertFileExists($migrationFilePath);

tests/CrudMakeCommandTest.php

@@ -14,7 +14,7 @@ class CrudMakeCommandTest extends TestCase
         $this->assertNotContains("{$this->model_name} model already exists.", app(Kernel::class)->output());
 
         $this->assertFileExists(app_path($this->model_name.'.php'));
-        $this->assertFileExists(app_path("Http/Controllers/{$this->plural_model_name}Controller.php"));
+        $this->assertFileExists(app_path("Http/Controllers/{$this->model_name}Controller.php"));
 
         $migrationFilePath = database_path('migrations/'.date('Y_m_d_His').'_create_'.$this->table_name.'_table.php');
         $this->assertFileExists($migrationFilePath);
@@ -43,7 +43,7 @@ class CrudMakeCommandTest extends TestCase
         $this->assertContains("{$this->model_name} model already exists.", app(Kernel::class)->output());
 
         $this->assertFileExists(app_path($this->model_name.'.php'));
-        $this->assertFileNotExists(app_path("Http/Controllers/{$this->plural_model_name}Controller.php"));
+        $this->assertFileNotExists(app_path("Http/Controllers/{$this->model_name}Controller.php"));
 
         $migrationFilePath = database_path('migrations/'.date('Y_m_d_His').'_create_'.$this->table_name.'_table.php');
         $this->assertFileNotExists($migrationFilePath);
@@ -110,7 +110,7 @@ class CrudMakeCommandTest extends TestCase
         $this->assertNotContains("{$modelName} model already exists.", app(Kernel::class)->output());
 
         $this->assertFileExists(app_path($modelPath.'/'.$modelName.'.php'));
-        $this->assertFileExists(app_path("Http/Controllers/{$pluralModelName}Controller.php"));
+        $this->assertFileExists(app_path("Http/Controllers/{$modelName}Controller.php"));
 
         $migrationFilePath = database_path('migrations/'.date('Y_m_d_His').'_create_'.$tableName.'_table.php');
         $this->assertFileExists($migrationFilePath);
@@ -145,7 +145,7 @@ class CrudMakeCommandTest extends TestCase
         $this->assertNotContains("{$modelName} model already exists.", app(Kernel::class)->output());
 
         $this->assertFileExists(app_path($modelPath.'/'.$modelName.'.php'));
-        $this->assertFileExists(app_path("Http/Controllers/{$parentName}/{$pluralModelName}Controller.php"));
+        $this->assertFileExists(app_path("Http/Controllers/{$parentName}/{$modelName}Controller.php"));
 
         $migrationFilePath = database_path('migrations/'.date('Y_m_d_His').'_create_'.$tableName.'_table.php');
         $this->assertFileExists($migrationFilePath);

tests/CrudSimpleMakeCommandTest.php

@@ -14,7 +14,7 @@ class CrudSimpleCommandTest extends TestCase
         $this->assertNotContains("{$this->model_name} model already exists.", app(Kernel::class)->output());
 
         $this->assertFileExists(app_path($this->model_name.'.php'));
-        $this->assertFileExists(app_path("Http/Controllers/{$this->plural_model_name}Controller.php"));
+        $this->assertFileExists(app_path("Http/Controllers/{$this->model_name}Controller.php"));
 
         $migrationFilePath = database_path('migrations/'.date('Y_m_d_His').'_create_'.$this->table_name.'_table.php');
         $this->assertFileExists($migrationFilePath);
@@ -41,7 +41,7 @@ class CrudSimpleCommandTest extends TestCase
         $this->assertContains("{$this->model_name} model already exists.", app(Kernel::class)->output());
 
         $this->assertFileExists(app_path($this->model_name.'.php'));
-        $this->assertFileNotExists(app_path("Http/Controllers/{$this->plural_model_name}Controller.php"));
+        $this->assertFileNotExists(app_path("Http/Controllers/{$this->model_name}Controller.php"));
 
         $migrationFilePath = database_path('migrations/'.date('Y_m_d_His').'_create_'.$this->table_name.'_table.php');
         $this->assertFileNotExists($migrationFilePath);
@@ -104,7 +104,7 @@ class CrudSimpleCommandTest extends TestCase
         $this->assertNotContains("{$modelName} model already exists.", app(Kernel::class)->output());
 
         $this->assertFileExists(app_path($modelPath.'/'.$modelName.'.php'));
-        $this->assertFileExists(app_path("Http/Controllers/{$pluralModelName}Controller.php"));
+        $this->assertFileExists(app_path("Http/Controllers/{$modelName}Controller.php"));
 
         $migrationFilePath = database_path('migrations/'.date('Y_m_d_His').'_create_'.$tableName.'_table.php');
         $this->assertFileExists($migrationFilePath);
@@ -137,7 +137,7 @@ class CrudSimpleCommandTest extends TestCase
         $this->assertNotContains("{$modelName} model already exists.", app(Kernel::class)->output());
 
         $this->assertFileExists(app_path($modelPath.'/'.$modelName.'.php'));
-        $this->assertFileExists(app_path("Http/Controllers/{$parentName}/{$pluralModelName}Controller.php"));
+        $this->assertFileExists(app_path("Http/Controllers/{$parentName}/{$modelName}Controller.php"));
 
         $migrationFilePath = database_path('migrations/'.date('Y_m_d_His').'_create_'.$tableName.'_table.php');
         $this->assertFileExists($migrationFilePath);

tests/Generators/Api/ApiControllerGeneratorTest.php

@@ -11,7 +11,7 @@ class ApiControllerGeneratorTest extends TestCase
     {
         $this->artisan('make:crud-api', ['name' => $this->model_name, '--no-interaction' => true]);
 
-        $this->assertFileExists(app_path("Http/Controllers/Api/{$this->plural_model_name}Controller.php"));
+        $this->assertFileExists(app_path("Http/Controllers/Api/{$this->model_name}Controller.php"));
         $ctrlClassContent = "<?php
 
 namespace App\Http\Controllers\Api;
@@ -20,7 +20,7 @@ use {$this->full_model_name};
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
-class {$this->plural_model_name}Controller extends Controller
+class {$this->model_name}Controller extends Controller
 {
     /**
      * Get a listing of the {$this->single_model_var_name}.
@@ -116,6 +116,6 @@ class {$this->plural_model_name}Controller extends Controller
     }
 }
 ";
-        $this->assertEquals($ctrlClassContent, file_get_contents(app_path("Http/Controllers/Api/{$this->plural_model_name}Controller.php")));
+        $this->assertEquals($ctrlClassContent, file_get_contents(app_path("Http/Controllers/Api/{$this->model_name}Controller.php")));
     }
 }

tests/Generators/Api/RouteApiGeneratorTest.php

@@ -18,7 +18,7 @@ class RouteApiGeneratorTest extends TestCase
 /*
  * {$this->plural_model_name} Endpoints
  */
-Route::middleware('auth:api')->resource('{$this->table_name}', 'Api\\{$this->plural_model_name}Controller')->names('api.{$this->table_name}');
+Route::middleware('auth:api')->resource('{$this->table_name}', 'Api\\{$this->model_name}Controller')->names('api.{$this->table_name}');
 ";
         $this->assertEquals($routeApiFileContent, file_get_contents($routeApiPath));
     }
@@ -35,7 +35,7 @@ Route::middleware('auth:api')->resource('{$this->table_name}', 'Api\\{$this->plu
 /*
  * {$this->plural_model_name} Endpoints
  */
-Route::middleware('auth:api')->resource('{$this->table_name}', 'Api\\Projects\\{$this->plural_model_name}Controller')->names('api.{$this->table_name}');
+Route::middleware('auth:api')->resource('{$this->table_name}', 'Api\\Projects\\{$this->model_name}Controller')->names('api.{$this->table_name}');
 ";
         $this->assertEquals($routeApiFileContent, file_get_contents($routeApiPath));
     }

tests/Generators/FullControllerGeneratorTest.php

@@ -11,7 +11,7 @@ class FullControllerGeneratorTest extends TestCase
     {
         $this->artisan('make:crud', ['name' => $this->model_name, '--no-interaction' => true]);
 
-        $this->assertFileExists(app_path("Http/Controllers/{$this->plural_model_name}Controller.php"));
+        $this->assertFileExists(app_path("Http/Controllers/{$this->model_name}Controller.php"));
         $ctrlClassContent = "<?php
 
 namespace App\Http\Controllers;
@@ -19,7 +19,7 @@ namespace App\Http\Controllers;
 use {$this->full_model_name};
 use Illuminate\Http\Request;
 
-class {$this->plural_model_name}Controller extends Controller
+class {$this->model_name}Controller extends Controller
 {
     /**
      * Display a listing of the {$this->single_model_var_name}.
@@ -136,7 +136,7 @@ class {$this->plural_model_name}Controller extends Controller
     }
 }
 ";
-        $this->assertEquals($ctrlClassContent, file_get_contents(app_path("Http/Controllers/{$this->plural_model_name}Controller.php")));
+        $this->assertEquals($ctrlClassContent, file_get_contents(app_path("Http/Controllers/{$this->model_name}Controller.php")));
     }
 
     /** @test */
@@ -144,7 +144,7 @@ class {$this->plural_model_name}Controller extends Controller
     {
         $this->artisan('make:crud', ['name' => 'Entities/References/Category', '--no-interaction' => true]);
 
-        $this->assertFileExists(app_path("Http/Controllers/CategoriesController.php"));
+        $this->assertFileExists(app_path("Http/Controllers/CategoryController.php"));
         $ctrlClassContent = "<?php
 
 namespace App\Http\Controllers;
@@ -152,7 +152,7 @@ namespace App\Http\Controllers;
 use App\Entities\References\Category;
 use Illuminate\Http\Request;
 
-class CategoriesController extends Controller
+class CategoryController extends Controller
 {
     /**
      * Display a listing of the category.
@@ -269,7 +269,7 @@ class CategoriesController extends Controller
     }
 }
 ";
-        $this->assertEquals($ctrlClassContent, file_get_contents(app_path("Http/Controllers/CategoriesController.php")));
+        $this->assertEquals($ctrlClassContent, file_get_contents(app_path("Http/Controllers/CategoryController.php")));
     }
 
     /** @test */
@@ -277,7 +277,7 @@ class CategoriesController extends Controller
     {
         $this->artisan('make:crud', ['name' => 'Entities/References/Category', '--parent' => 'Projects', '--no-interaction' => true]);
 
-        $this->assertFileExists(app_path("Http/Controllers/Projects/CategoriesController.php"));
+        $this->assertFileExists(app_path("Http/Controllers/Projects/CategoryController.php"));
         $ctrlClassContent = "<?php
 
 namespace App\Http\Controllers\Projects;
@@ -286,7 +286,7 @@ use App\Entities\References\Category;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
-class CategoriesController extends Controller
+class CategoryController extends Controller
 {
     /**
      * Display a listing of the category.
@@ -403,6 +403,6 @@ class CategoriesController extends Controller
     }
 }
 ";
-        $this->assertEquals($ctrlClassContent, file_get_contents(app_path("Http/Controllers/Projects/CategoriesController.php")));
+        $this->assertEquals($ctrlClassContent, file_get_contents(app_path("Http/Controllers/Projects/CategoryController.php")));
     }
 }

tests/Generators/RouteWebGeneratorTest.php

@@ -18,7 +18,7 @@ class RouteWebGeneratorTest extends TestCase
 /*
  * {$this->plural_model_name} Routes
  */
-Route::resource('{$this->table_name}', '{$this->plural_model_name}Controller');
+Route::resource('{$this->table_name}', '{$this->model_name}Controller');
 ";
         $this->assertEquals($routeWebFileContent, file_get_contents($routeWebPath));
     }
@@ -35,7 +35,7 @@ Route::resource('{$this->table_name}', '{$this->plural_model_name}Controller');
 /*
  * {$this->plural_model_name} Routes
  */
-Route::resource('{$this->table_name}', 'Projects\\{$this->plural_model_name}Controller');
+Route::resource('{$this->table_name}', 'Projects\\{$this->model_name}Controller');
 ";
         $this->assertEquals($routeWebFileContent, file_get_contents($routeWebPath));
     }

tests/Generators/Simple/SimpleControllerGeneratorTest.php

@@ -11,7 +11,7 @@ class SimpleControllerGeneratorTest extends TestCase
     {
         $this->artisan('make:crud-simple', ['name' => $this->model_name, '--no-interaction' => true]);
 
-        $this->assertFileExists(app_path("Http/Controllers/{$this->plural_model_name}Controller.php"));
+        $this->assertFileExists(app_path("Http/Controllers/{$this->model_name}Controller.php"));
         $ctrlClassContent = "<?php
 
 namespace App\Http\Controllers;
@@ -19,7 +19,7 @@ namespace App\Http\Controllers;
 use {$this->full_model_name};
 use Illuminate\Http\Request;
 
-class {$this->plural_model_name}Controller extends Controller
+class {$this->model_name}Controller extends Controller
 {
     /**
      * Display a listing of the {$this->single_model_var_name}.
@@ -107,7 +107,7 @@ class {$this->plural_model_name}Controller extends Controller
     }
 }
 ";
-        $this->assertEquals($ctrlClassContent, file_get_contents(app_path("Http/Controllers/{$this->plural_model_name}Controller.php")));
+        $this->assertEquals($ctrlClassContent, file_get_contents(app_path("Http/Controllers/{$this->model_name}Controller.php")));
     }
 
     /** @test */
@@ -115,7 +115,7 @@ class {$this->plural_model_name}Controller extends Controller
     {
         $this->artisan('make:crud-simple', ['name' => 'Entities/References/Category', '--no-interaction' => true]);
 
-        $this->assertFileExists(app_path("Http/Controllers/CategoriesController.php"));
+        $this->assertFileExists(app_path("Http/Controllers/CategoryController.php"));
         $ctrlClassContent = "<?php
 
 namespace App\Http\Controllers;
@@ -123,7 +123,7 @@ namespace App\Http\Controllers;
 use App\Entities\References\Category;
 use Illuminate\Http\Request;
 
-class CategoriesController extends Controller
+class CategoryController extends Controller
 {
     /**
      * Display a listing of the category.
@@ -211,7 +211,7 @@ class CategoriesController extends Controller
     }
 }
 ";
-        $this->assertEquals($ctrlClassContent, file_get_contents(app_path("Http/Controllers/CategoriesController.php")));
+        $this->assertEquals($ctrlClassContent, file_get_contents(app_path("Http/Controllers/CategoryController.php")));
     }
 
     /** @test */
@@ -219,7 +219,7 @@ class CategoriesController extends Controller
     {
         $this->artisan('make:crud-simple', ['name' => 'Entities/References/Category', '--parent' => 'Projects', '--no-interaction' => true]);
 
-        $this->assertFileExists(app_path("Http/Controllers/Projects/CategoriesController.php"));
+        $this->assertFileExists(app_path("Http/Controllers/Projects/CategoryController.php"));
         $ctrlClassContent = "<?php
 
 namespace App\Http\Controllers\Projects;
@@ -228,7 +228,7 @@ use App\Entities\References\Category;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
-class CategoriesController extends Controller
+class CategoryController extends Controller
 {
     /**
      * Display a listing of the category.
@@ -316,6 +316,6 @@ class CategoriesController extends Controller
     }
 }
 ";
-        $this->assertEquals($ctrlClassContent, file_get_contents(app_path("Http/Controllers/Projects/CategoriesController.php")));
+        $this->assertEquals($ctrlClassContent, file_get_contents(app_path("Http/Controllers/Projects/CategoryController.php")));
     }
 }