Merge branch 'hotfix/hotfix-languages'

Author: Andrea Civita

.gitignore

@@ -2,4 +2,5 @@
 *.iml
 vendor/
 composer.lock
-.php_cs.cache
+.php_cs.cache
+.phpunit.result.cache

.travis.yml

@@ -3,7 +3,7 @@ language: php
 php:
 - 7.3
 - 7.4
--8.0
+- 8.0
 
 before_script:
 - composer self-update

src/Commands/ApiCrudGenerator.php

@@ -5,6 +5,7 @@
 use AndreaCivita\ApiCrudGenerator\Core\Generator;
 use Doctrine\DBAL\Driver\PDOException;
 use Illuminate\Console\Command;
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
@@ -37,15 +38,15 @@ class ApiCrudGenerator extends Command
      *
      * Generator support instance
      *
-     * @var \AndreaCivita\ApiCrudGenerator\Core\Generator
+     * @var Generator
      */
     protected $generator;
 
 
     /**
      * The String support instance
      *
-     * @var \Illuminate\Support\Str
+     * @var Str
      */
     protected $str;
 
@@ -58,7 +59,7 @@ class ApiCrudGenerator extends Command
     /**
      * Schema support instance
      *
-     * @var \Illuminate\Support\Facades\Schema $schema
+     * @var Schema $schema
      */
     protected $schema;
 
@@ -80,10 +81,9 @@ public function __construct(Generator $generator, Str $str, Schema $schema)
     /**
      * Execute the console command.
      *
-     * @return mixed
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
+     * @return int
      */
-    public function handle()
+    public function handle() : int
     {
         // Checking interactive mode
         if ($this->option('interactive') == "") {
@@ -113,7 +113,6 @@ public function handle()
 
     /**
      * Handle all-db generation
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
     protected function all()
     {
@@ -126,18 +125,16 @@ protected function all()
                 in_array('created_at', $columns) ? $timestamps = true : $timestamps = false;
                 $this->generate($name, $table, $timestamps);
             }
-        }
-        catch (QueryException $exception) {
+        } catch (QueryException $exception) {
             $this->error("Error: " . $exception->getMessage());
         }
     }
 
 
     /**
      * Generate CRUD in interactive mode
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
-    protected function interactive()
+    protected function interactive() : void
     {
         $this->info("Welcome in Interactive mode");
 
@@ -170,26 +167,27 @@ protected function interactive()
      * @param $name string Model Name
      * @param $table string Table Name
      * @param $timestamps boolean
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
-    protected function generate($name, $table, $timestamps)
+    protected function generate(string $name, string $table, bool $timestamps)
     {
-        $this->generator->controller($name);
+        $this->generator->controller($name, $table);
         $this->info("Generated Controller!");
+
         $this->generator->model($name, $table, $timestamps);
         $this->info("Generated Model!");
+
         $this->generator->request($name);
         $this->info("Generated Request!");
+
         $this->generator->resource($name);
         $this->info("Generated Resource!");
-        if ($this->passport) {
-            $this->generator->secureRoutes($name);
-        } else {
-            $this->generator->routes($name);
-        }
+
+        $this->passport ? $this->generator->secureRoutes($name) : $this->generator->routes($name);
         $this->info("Generated routes!");
+
         $this->generator->factory($name);
         $this->info("Generated Factory!");
+
         $this->generator->test($name);
         $this->info("Generated Test!");
     }

src/Core/Generator.php

@@ -2,6 +2,7 @@
 
 namespace AndreaCivita\ApiCrudGenerator\Core;
 
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Str;
 
@@ -11,21 +12,21 @@ class Generator
     /**
      * The filesystem instance.
      *
-     * @var \Illuminate\Filesystem\Filesystem
+     * @var Filesystem
      */
     protected $files;
 
     /**
      * The String support instance
      *
-     * @var \Illuminate\Support\Str
+     * @var Str
      */
     protected $str;
 
     /**
      * The Stub support instance
      *
-     * @var \AndreaCivita\ApiCrudGenerator\Core\Stub;
+     * @var Stub;
      */
     protected $stub;
 
@@ -44,7 +45,7 @@ public function __construct(Filesystem $files, Str $str, Stub $stub)
      * @param $timestamps boolean set timestamps true | false
      * @return bool|int
      */
-    public function model($name, $table, $timestamps)
+    public function model(string $name, string $table, bool $timestamps)
     {
         $table === "default" ? $table = strtolower($this->str->plural($name)) : null;
 
@@ -68,23 +69,23 @@ public function model($name, $table, $timestamps)
      * Create controller from controller.stub
      *
      * @param $name string name of model class
+     * @param $table string name of db table
      * @return bool|int
      */
-    public function controller($name)
+    public function controller(string $name, string $table)
     {
-        $content = $this->stub->parseStub('Controller', $name);
+        $content = $this->stub->parseStub('Controller', $name, ['table' => $table]);
 
         return $this->files->put("app/Http/Controllers/{$name}Controller.php", $content);
     }
 
     /**
      * Generate Request from request.stub
      *
-     * @param $name
+     * @param $name string
      * @return bool|int
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
-    public function request($name)
+    public function request(string $name)
     {
         $content = $this->stub->parseStub('Request', $name);
 
@@ -99,7 +100,6 @@ public function request($name)
      *
      * @param $name
      * @return bool|int
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
     public function resource($name)
     {
@@ -114,11 +114,10 @@ public function resource($name)
     /**
      * Generate factory from Factory.stub
      *
-     * @param $name
+     * @param $name string
      * @return int
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
-    public function factory($name)
+    public function factory(string $name): int
     {
         $content = $this->stub->parseStub('Factory', $name);
 
@@ -133,7 +132,6 @@ public function factory($name)
      *
      * @param $name
      * @return int
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
     public function routes($name)
     {
@@ -143,11 +141,10 @@ public function routes($name)
     }
 
     /**
-     * @param $name
+     * @param $name string
      * @return int
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
-    public function secureRoutes($name)
+    public function secureRoutes(string $name) : int
     {
         $content = $this->stub->parseStub('Passport-Routes', $name);
 
@@ -157,11 +154,10 @@ public function secureRoutes($name)
     /**
      * Generate unit test
      *
-     * @param $name
+     * @param $name string
      * @return int
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
-    public function test($name)
+    public function test(string $name) : int
     {
         $content = $this->stub->parseStub('Test', $name);
 

src/Core/Stub.php

@@ -69,11 +69,11 @@ protected function getStub($type)
      * @param $args array additional placeholders to replace
      * @return mixed
      */
-    public function parseStub($stub, $name, $args = [])
+    public function parseStub(string $stub, string $name, array $args = [])
     {
         $toParse = array_merge([
             'modelName' => $name,
-            'modelNamePluralLowerCase' => strtolower($this->str->plural($name)),
+            'modelNamePluralLowerCase' => $args['table'] ?? strtolower($this->str->plural($name)),
             'modelNameSingularLowerCase' => strtolower($name)
         ], $args);
 

src/stubs/Controller.stub

@@ -5,13 +5,16 @@ namespace App\Http\Controllers;
 use App\Models\{{modelName}};
 use App\Http\Requests\{{modelName}}Request;
 use App\Http\Resources\{{modelName}}Resource;
+use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
+use Illuminate\Http\JsonResponse;
+
 
 class {{modelName}}Controller extends Controller
 {
     /**
      * Display a listing of the resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return AnonymousResourceCollection
      */
     public function index()
     {
@@ -23,8 +26,8 @@ class {{modelName}}Controller extends Controller
     /**
      * Store a newly created resource in storage.
      *
-     * @param  \App\Http\Requests\{{modelName}}Request  $request
-     * @return \Illuminate\Http\Response
+     * @param  {{modelName}}Request  $request
+     * @return {{modelName}}Resource
      */
     public function store({{modelName}}Request $request)
     {
@@ -36,8 +39,8 @@ class {{modelName}}Controller extends Controller
     /**
      * Display the specified resource.
      *
-     * @param  \App\Models\{{modelName}}  ${{modelNameSingularLowerCase}}
-     * @return \Illuminate\Http\Response
+     * @param  {{modelName}}  ${{modelNameSingularLowerCase}}
+     * @return {{modelName}}Resource
      */
     public function show({{modelName}} ${{modelNameSingularLowerCase}})
     {
@@ -49,7 +52,7 @@ class {{modelName}}Controller extends Controller
      *
      * @param  \App\Http\Requests\{{modelName}}Request  $request
      * @param  \App\Models\{{modelName}}  ${{modelNameSingularLowerCase}}
-     * @return \Illuminate\Http\Response
+     * @return {{modelName}}Resource
      */
     public function update({{modelName}}Request $request, {{modelName}} ${{modelNameSingularLowerCase}})
     {
@@ -62,7 +65,7 @@ class {{modelName}}Controller extends Controller
      * Remove the specified resource from storage.
      *
      * @param  \App\Models\{{modelName}}  ${{modelNameSingularLowerCase}}
-     * @return \Illuminate\Http\Response
+     * @return JsonResponse
      */
     public function destroy({{modelName}} ${{modelNameSingularLowerCase}})
     {

src/stubs/Factory.stub

@@ -1,7 +1,7 @@
 <?php
 
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Support\Str;
+use App\Models\{{modelName}};
 
 class {{modelName}}Factory extends Factory
 {
@@ -10,7 +10,7 @@ class {{modelName}}Factory extends Factory
      *
      * @var string
      */
-    protected $model = \App\Models\{{modelName}}::class;
+    protected $model = {{modelName}}::class;
 
     /**
      * Define the model's default state.

src/stubs/Resource.stub

@@ -2,14 +2,15 @@
 
 namespace App\Http\Resources;
 
+use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class {{modelName}}Resource extends JsonResource
 {
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  Request  $request
      * @return array
      */
     public function toArray($request)