Merge pull request #47 from nafiesl/laravel_9_support

nafiesl · web-flow · commit e6be8cfff11b · 2022-03-06T11:36:16.000+08:00
Laravel 9 support
diff --git a/composer.json b/composer.json
@@ -20,12 +20,12 @@
         }
     },
     "require": {
-        "php": "^7.3|^8.0",
-        "illuminate/support": "^8.0",
-        "laravel/browser-kit-testing": "^6.0"
+        "php": "^8.0",
+        "illuminate/support": "^9.0",
+        "laravel/browser-kit-testing": "^6.3"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.0"
+        "orchestra/testbench": "^7.0"
     },
     "extra": {
         "laravel": {
diff --git a/composer.lock b/composer.lock
diff --git a/src/Generators/FormRequestGenerator.php b/src/Generators/FormRequestGenerator.php
@@ -20,9 +20,11 @@ public function generate(string $type = 'full')
 
         $requestPath = $this->makeDirectory(app_path('Http/Requests/'.$pluralModelName));
 
-        $this->generateFile(
-            $requestPath.'/CreateRequest.php', $this->getContent('requests/create-request')
-        );
+        if ($this->command->option('uuid')) {
+            $this->generateFile($requestPath.'/CreateRequest.php', $this->getContent('requests/create-request-uuid'));
+        } else {
+            $this->generateFile($requestPath.'/CreateRequest.php', $this->getContent('requests/create-request'));
+        }
         $this->generateFile(
             $requestPath.'/UpdateRequest.php', $this->getContent('requests/update-request')
         );
diff --git a/src/Generators/LangFileGenerator.php b/src/Generators/LangFileGenerator.php
@@ -15,7 +15,7 @@ class LangFileGenerator extends BaseGenerator
     public function generate(string $type = 'full')
     {
         $locale = config('app.locale');
-        $langPath = $this->makeDirectory(resource_path('lang/'.$locale));
+        $langPath = $this->makeDirectory(base_path('lang/'.$locale));
 
         $this->createAppLangFile($langPath);
 
diff --git a/src/stubs/requests/create-request-uuid.stub b/src/stubs/requests/create-request-uuid.stub
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Requests\Masters;
+
+use fullMstr;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Str;
+
+class CreateRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return $this->user()->can('create', new Master);
+    }
+
+    public function rules()
+    {
+        return [
+            'title'       => 'required|max:60',
+            'description' => 'nullable|max:255',
+        ];
+    }
+
+    public function save()
+    {
+        $newMaster = $this->validated();
+        $newMaster['id'] = Str::uuid();
+        $newMaster['creator_id'] = auth()->id();
+
+        return Master::create($newMaster);
+    }
+}
diff --git a/tests/CommandOptions/FullCrudBs3OptionsTest.php b/tests/CommandOptions/FullCrudBs3OptionsTest.php
@@ -26,7 +26,7 @@ public function it_can_generate_views_with_bootstrap3_for_full_crud()
         $this->assertFileDoesNotExist(resource_path("views/{$this->table_name}/forms.blade.php"));
 
         $localeConfig = config('app.locale');
-        $this->assertFileExists(resource_path("lang/{$localeConfig}/{$this->lang_name}.php"));
+        $this->assertFileExists(base_path("lang/{$localeConfig}/{$this->lang_name}.php"));
 
         $this->assertFileExists(base_path("routes/web.php"));
         $this->assertFileExists(app_path("Policies/{$this->model_name}Policy.php"));
diff --git a/tests/CommandOptions/FullCrudFormRequestOptionsTest.php b/tests/CommandOptions/FullCrudFormRequestOptionsTest.php
@@ -28,7 +28,7 @@ public function it_can_generate_form_request_classes()
         $this->assertFileDoesNotExist(resource_path("views/{$this->table_name}/forms.blade.php"));
 
         $localeConfig = config('app.locale');
-        $this->assertFileExists(resource_path("lang/{$localeConfig}/{$this->lang_name}.php"));
+        $this->assertFileExists(base_path("lang/{$localeConfig}/{$this->lang_name}.php"));
 
         $this->assertFileExists(base_path("routes/web.php"));
         $this->assertFileExists(app_path("Policies/{$this->model_name}Policy.php"));
diff --git a/tests/CommandOptions/FullCrudFormfieldBs3OptionsTest.php b/tests/CommandOptions/FullCrudFormfieldBs3OptionsTest.php
@@ -26,7 +26,7 @@ public function it_can_generate_views_with_formfield_and_bootstrap3_for_full_cru
         $this->assertFileDoesNotExist(resource_path("views/{$this->table_name}/forms.blade.php"));
 
         $localeConfig = config('app.locale');
-        $this->assertFileExists(resource_path("lang/{$localeConfig}/{$this->lang_name}.php"));
+        $this->assertFileExists(base_path("lang/{$localeConfig}/{$this->lang_name}.php"));
 
         $this->assertFileExists(base_path("routes/web.php"));
         $this->assertFileExists(app_path("Policies/{$this->model_name}Policy.php"));
diff --git a/tests/CommandOptions/FullCrudFormfieldOptionsTest.php b/tests/CommandOptions/FullCrudFormfieldOptionsTest.php
@@ -26,7 +26,7 @@ public function it_can_generate_views_with_formfield_for_full_crud()
         $this->assertFileDoesNotExist(resource_path("views/{$this->table_name}/forms.blade.php"));
 
         $localeConfig = config('app.locale');
-        $this->assertFileExists(resource_path("lang/{$localeConfig}/{$this->lang_name}.php"));
+        $this->assertFileExists(base_path("lang/{$localeConfig}/{$this->lang_name}.php"));
 
         $this->assertFileExists(base_path("routes/web.php"));
         $this->assertFileExists(app_path("Policies/{$this->model_name}Policy.php"));
diff --git a/tests/CommandOptions/SimpleCrudBs3OptionsTest.php b/tests/CommandOptions/SimpleCrudBs3OptionsTest.php
@@ -24,7 +24,7 @@ public function it_can_generate_views_with_bootstrap3_for_simple_crud()
         $this->assertFileExists(resource_path("views/{$this->table_name}/forms.blade.php"));
 
         $localeConfig = config('app.locale');
-        $this->assertFileExists(resource_path("lang/{$localeConfig}/{$this->lang_name}.php"));
+        $this->assertFileExists(base_path("lang/{$localeConfig}/{$this->lang_name}.php"));
 
         $this->assertFileExists(base_path("routes/web.php"));
         $this->assertFileExists(app_path("Policies/{$this->model_name}Policy.php"));
diff --git a/tests/CommandOptions/SimpleCrudFormfieldBs3OptionsTest.php b/tests/CommandOptions/SimpleCrudFormfieldBs3OptionsTest.php
@@ -24,7 +24,7 @@ public function it_can_generate_views_with_formfield_for_simple_crud()
         $this->assertFileExists(resource_path("views/{$this->table_name}/forms.blade.php"));
 
         $localeConfig = config('app.locale');
-        $this->assertFileExists(resource_path("lang/{$localeConfig}/{$this->lang_name}.php"));
+        $this->assertFileExists(base_path("lang/{$localeConfig}/{$this->lang_name}.php"));
 
         $this->assertFileExists(base_path("routes/web.php"));
         $this->assertFileExists(app_path("Policies/{$this->model_name}Policy.php"));
diff --git a/tests/CommandOptions/SimpleCrudFormfieldOptionsTest.php b/tests/CommandOptions/SimpleCrudFormfieldOptionsTest.php
@@ -24,7 +24,7 @@ public function it_can_generate_views_with_formfield_for_simple_crud()
         $this->assertFileExists(resource_path("views/{$this->table_name}/forms.blade.php"));
 
         $localeConfig = config('app.locale');
-        $this->assertFileExists(resource_path("lang/{$localeConfig}/{$this->lang_name}.php"));
+        $this->assertFileExists(base_path("lang/{$localeConfig}/{$this->lang_name}.php"));
 
         $this->assertFileExists(base_path("routes/web.php"));
         $this->assertFileExists(app_path("Policies/{$this->model_name}Policy.php"));
diff --git a/tests/CommandOptions/UuidOptionsTest.php b/tests/CommandOptions/UuidOptionsTest.php
@@ -293,4 +293,49 @@ public function destroy(Request \$request, {$this->model_name} \${$this->single_
 ";
         $this->assertEquals($ctrlClassContent, file_get_contents(app_path("Http/Controllers/{$this->model_name}Controller.php")));
     }
+
+    /** @test */
+    public function it_creates_correct_create_form_request_class_content_for_uuid_primary_key()
+    {
+        $this->artisan('make:crud', ['name' => $this->model_name, '--uuid' => true, '--form-requests' => true, '--no-interaction' => true]);
+        $this->artisan('make:crud', ['name' => $this->model_name, '--no-interaction' => true, '--form-requests' => true]);
+
+        $classFilePath = app_path("Http/Requests/{$this->plural_model_name}/CreateRequest.php");
+
+        $this->assertFileExists($classFilePath);
+        $formRequestClassContent = "<?php
+
+namespace App\Http\Requests\\{$this->plural_model_name};
+
+use {$this->full_model_name};
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Str;
+
+class CreateRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return \$this->user()->can('create', new {$this->model_name});
+    }
+
+    public function rules()
+    {
+        return [
+            'title'       => 'required|max:60',
+            'description' => 'nullable|max:255',
+        ];
+    }
+
+    public function save()
+    {
+        \$new{$this->model_name} = \$this->validated();
+        \$new{$this->model_name}['id'] = Str::uuid();
+        \$new{$this->model_name}['creator_id'] = auth()->id();
+
+        return {$this->model_name}::create(\$new{$this->model_name});
+    }
+}
+";
+        $this->assertEquals($formRequestClassContent, file_get_contents($classFilePath));
+    }
 }
diff --git a/tests/CrudApiMakeCommandTest.php b/tests/CrudApiMakeCommandTest.php
@@ -23,7 +23,7 @@ public function it_can_generate_api_crud_files()
         $this->assertFileDoesNotExist(resource_path("views/{$this->table_name}/forms.blade.php"));
 
         $localeConfig = config('app.locale');
-        $this->assertFileExists(resource_path("lang/{$localeConfig}/{$this->lang_name}.php"));
+        $this->assertFileExists(base_path("lang/{$localeConfig}/{$this->lang_name}.php"));
 
         $this->assertFileExists(base_path("routes/api.php"));
         $this->assertFileExists(app_path("Policies/{$this->model_name}Policy.php"));
@@ -112,7 +112,7 @@ public function it_can_generate_crud_files_for_namespaced_model()
         $this->assertFileDoesNotExist(resource_path("views/{$tableName}/forms.blade.php"));
 
         $localeConfig = config('app.locale');
-        $this->assertFileExists(resource_path("lang/{$localeConfig}/{$langName}.php"));
+        $this->assertFileExists(base_path("lang/{$localeConfig}/{$langName}.php"));
 
         $this->assertFileExists(app_path("Policies/{$modelName}Policy.php"));
         $this->assertFileExists(database_path("factories/{$inputName}Factory.php"));
@@ -146,7 +146,7 @@ public function it_can_generate_crud_files_with_parent_option()
         $this->assertFileDoesNotExist(resource_path("views/{$tableName}/forms.blade.php"));
 
         $localeConfig = config('app.locale');
-        $this->assertFileExists(resource_path("lang/{$localeConfig}/{$langName}.php"));
+        $this->assertFileExists(base_path("lang/{$localeConfig}/{$langName}.php"));
 
         $this->assertFileExists(database_path("factories/{$inputName}Factory.php"));
         $this->assertFileExists(base_path("tests/Unit/Models/{$modelName}Test.php"));
diff --git a/tests/CrudMakeCommandTest.php b/tests/CrudMakeCommandTest.php
@@ -25,7 +25,7 @@ public function it_can_generate_simple_crud_files()
         $this->assertFileDoesNotExist(resource_path("views/{$this->table_name}/forms.blade.php"));
 
         $localeConfig = config('app.locale');
-        $this->assertFileExists(resource_path("lang/{$localeConfig}/{$this->lang_name}.php"));
+        $this->assertFileExists(base_path("lang/{$localeConfig}/{$this->lang_name}.php"));
 
         $this->assertFileExists(base_path("routes/web.php"));
         $this->assertFileExists(app_path("Policies/{$this->model_name}Policy.php"));
@@ -55,7 +55,7 @@ public function it_generates_crud_files_for_existing_model()
         $this->assertFileDoesNotExist(resource_path("views/{$this->table_name}/forms.blade.php"));
 
         $localeConfig = config('app.locale');
-        $this->assertFileExists(resource_path("lang/{$localeConfig}/{$this->lang_name}.php"));
+        $this->assertFileExists(base_path("lang/{$localeConfig}/{$this->lang_name}.php"));
 
         $this->assertFileExists(base_path("routes/web.php"));
         $this->assertFileExists(app_path("Policies/{$this->model_name}Policy.php"));
@@ -125,7 +125,7 @@ public function it_can_generate_crud_files_for_namespaced_model()
         $this->assertFileDoesNotExist(resource_path("views/{$tableName}/forms.blade.php"));
 
         $localeConfig = config('app.locale');
-        $this->assertFileExists(resource_path("lang/{$localeConfig}/{$langName}.php"));
+        $this->assertFileExists(base_path("lang/{$localeConfig}/{$langName}.php"));
 
         $this->assertFileExists(app_path("Policies/{$modelName}Policy.php"));
         $this->assertFileExists(database_path("factories/{$inputName}Factory.php"));
@@ -161,7 +161,7 @@ public function it_can_generate_crud_files_with_parent_option()
         $this->assertFileDoesNotExist(resource_path("views/{$tableName}/forms.blade.php"));
 
         $localeConfig = config('app.locale');
-        $this->assertFileExists(resource_path("lang/{$localeConfig}/{$langName}.php"));
+        $this->assertFileExists(base_path("lang/{$localeConfig}/{$langName}.php"));
 
         $this->assertFileExists(database_path("factories/{$inputName}Factory.php"));
         $this->assertFileExists(base_path("tests/Unit/Models/{$modelName}Test.php"));
diff --git a/tests/CrudSimpleMakeCommandTest.php b/tests/CrudSimpleMakeCommandTest.php
@@ -23,7 +23,7 @@ public function it_can_generate_simple_crud_files()
         $this->assertFileExists(resource_path("views/{$this->table_name}/forms.blade.php"));
 
         $localeConfig = config('app.locale');
-        $this->assertFileExists(resource_path("lang/{$localeConfig}/{$this->lang_name}.php"));
+        $this->assertFileExists(base_path("lang/{$localeConfig}/{$this->lang_name}.php"));
 
         $this->assertFileExists(base_path("routes/web.php"));
         $this->assertFileExists(app_path("Policies/{$this->model_name}Policy.php"));
@@ -118,7 +118,7 @@ public function it_can_generate_crud_files_for_namespaced_model()
         $this->assertFileExists(resource_path("views/{$tableName}/forms.blade.php"));
 
         $localeConfig = config('app.locale');
-        $this->assertFileExists(resource_path("lang/{$localeConfig}/{$langName}.php"));
+        $this->assertFileExists(base_path("lang/{$localeConfig}/{$langName}.php"));
 
         $this->assertFileExists(app_path("Policies/{$modelName}Policy.php"));
         $this->assertFileExists(database_path("factories/{$inputName}Factory.php"));
@@ -152,7 +152,7 @@ public function it_can_generate_crud_files_with_parent_option()
         $this->assertFileExists(resource_path("views/{$tableName}/forms.blade.php"));
 
         $localeConfig = config('app.locale');
-        $this->assertFileExists(resource_path("lang/{$localeConfig}/{$langName}.php"));
+        $this->assertFileExists(base_path("lang/{$localeConfig}/{$langName}.php"));
 
         $this->assertFileExists(database_path("factories/{$inputName}Factory.php"));
         $this->assertFileExists(base_path("tests/Unit/Models/{$modelName}Test.php"));
diff --git a/tests/Generators/LangGeneratorTest.php b/tests/Generators/LangGeneratorTest.php
@@ -13,7 +13,7 @@ public function it_creates_correct_model_lang_content()
         $this->artisan('make:crud', ['name' => $this->model_name, '--no-interaction' => true]);
 
         $locale = config('app.locale');
-        $langPath = resource_path('lang/'.$locale.'/'.$this->lang_name.'.php');
+        $langPath = base_path('lang/'.$locale.'/'.$this->lang_name.'.php');
         $displayModelName = ucwords(str_replace('_', ' ', Str::snake($this->model_name)));
         $this->assertFileExists($langPath);
         $langFileContent = "<?php
@@ -60,7 +60,7 @@ public function it_creates_correct_model_lang_content_based_on_locale_config()
         $this->artisan('make:crud', ['name' => $this->model_name, '--no-interaction' => true]);
 
         $locale = config('app.locale');
-        $langPath = resource_path('lang/'.$locale.'/'.$this->lang_name.'.php');
+        $langPath = base_path('lang/'.$locale.'/'.$this->lang_name.'.php');
         $displayModelName = ucwords(str_replace('_', ' ', Str::snake($this->model_name)));
         $this->assertFileExists($langPath);
         $langFileContent = "<?php
@@ -106,7 +106,7 @@ public function it_creates_app_lang_if_it_doesnt_exists()
         $this->artisan('make:crud', ['name' => $this->model_name, '--no-interaction' => true]);
 
         $locale = config('app.locale');
-        $langPath = resource_path('lang/'.$locale.'/app.php');
+        $langPath = base_path('lang/'.$locale.'/app.php');
 
         $this->assertFileExists($langPath);
         $appLangContent = "<?php
@@ -139,7 +139,7 @@ public function it_creates_app_lang_based_on_locale_if_stub_exists()
         $this->artisan('make:crud', ['name' => $this->model_name, '--no-interaction' => true]);
 
         $locale = config('app.locale');
-        $langPath = resource_path('lang/'.$locale.'/app.php');
+        $langPath = base_path('lang/'.$locale.'/app.php');
 
         $this->assertFileExists($langPath);
         $appLangContent = "<?php
diff --git a/tests/Generators/ModelFactoryGeneratorTest.php b/tests/Generators/ModelFactoryGeneratorTest.php
@@ -142,6 +142,9 @@ public function it_doesnt_override_the_existing_model_factory_content()
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Model>
+ */
 class {$this->model_name}Factory extends Factory
 {
     /**

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class LangFileGenerator extends BaseGenerator`
`15`	`15`	`public function generate(string $type = 'full')`
`16`	`16`	`{`
`17`	`17`	`$locale = config('app.locale');`
`18`		`- $langPath = $this->makeDirectory(resource_path('lang/'.$locale));`
	`18`	`+ $langPath = $this->makeDirectory(base_path('lang/'.$locale));`
`19`	`19`
`20`	`20`	`$this->createAppLangFile($langPath);`
`21`	`21`