Merge pull request #21 from jargoud/feat/import-form-action

feat(import): dynamic form action

Author: thomascombe

composer.json

@@ -27,11 +27,10 @@
     "require-dev": {
         "laravel/scout": "^10.10",
         "nunomaduro/collision": "^8.1",
-        "nunomaduro/larastan": "^2.0",
+        "nunomaduro/larastan": "^3.0",
         "orchestra/testbench": "^9.0",
-        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan": "^2.0",
         "phpunit/phpunit": "^10.1",
-        "spatie/laravel-ray": "^1.30",
         "squizlabs/php_codesniffer": "^3.7",
         "vimeo/psalm": "^5.0"
     },

phpstan.neon

@@ -2,20 +2,11 @@ includes:
     - ./vendor/nunomaduro/larastan/extension.neon
 
 parameters:
-
-    paths:
-        - src/
-
-    # Level 9 is the highest level
-    level: 6
-
-#    ignoreErrors:
-#        - '#PHPDoc tag @var#'
-#
-#    excludePaths:
-#        - ./*/*/FileToBeExcluded.php
-#
-#    checkMissingIterableValueType: false
-    checkMissingIterableValueType: false
-
-    checkGenericClassInNonGenericObjectType: false
+	level: 6
+	paths:
+		- src
+	ignoreErrors:
+		- '#Class [a-zA-Z0-9\\_]+ implements generic interface [a-zA-Z0-9\\_]+ but does not specify its types: [a-zA-Z0-9\\_]+#'
+		- '#Method [a-zA-Z0-9\\_]+::[a-zA-Z0-9\\_]+\(\) return type with generic class [a-zA-Z0-9\\_]+ does not specify its types: .+#'
+		- '#Trait [a-zA-Z0-9\\_]+ is used zero times and is not analysed.#'
+		- '#Unable to resolve the template type TRelatedModel in call to method [a-zA-Z0-9\\_]+::[a-zA-Z0-9\\_]+\(\)#'

resources/views/pages/import.blade.php

@@ -28,7 +28,7 @@
         <div class="{{ $crud->getEditContentClass() }}">
             @include('crud::inc.grouped_errors')
 
-            <form action="{{ url($crud->route . '/import') }}" enctype="multipart/form-data" method="post">
+            <form action="{{ $action }}" enctype="multipart/form-data" method="post">
                 @csrf
 
                 @includeFirst(

src/Http/Controllers/Admin/Interfaces/ExportableCrud.php

@@ -8,5 +8,8 @@ interface ExportableCrud
 {
     public function getExport(): ImportExport;
 
+    /**
+     * @return array<string, mixed>
+     */
     public function getExportParameters(): array;
 }

src/Http/Controllers/Admin/Interfaces/ImportableCrud.php

@@ -8,5 +8,8 @@ interface ImportableCrud
 {
     public function getImport(): ImportExport;
 
+    /**
+     * @return array<string, mixed>
+     */
     public function getImportParameters(): array;
 }

src/Http/Controllers/Admin/Interfaces/MultiExportableCrud.php

@@ -7,5 +7,8 @@ interface MultiExportableCrud
     public const QUERY_PARAM = 'export';
     public const DEFAULT_EXPORT_NAME = 'default';
 
+    /**
+     * @return array<string, mixed>
+     */
     public function getAvailableExports(): array;
 }

src/Http/Controllers/Admin/Traits/HasImportButton.php

@@ -32,6 +32,9 @@ public function import(): View
 
         $this->data['crud'] = $this->crud;
         $this->data['title'] = $this->crud->getTitle();
+        $this->data['action'] = url(
+            $this->crud->route . '/' . config('backpack-async-import-export.admin_import_route'),
+        );
 
         return view('backpack-async-export::pages.import', $this->data);
     }

src/Http/Requests/ImportRequest.php

@@ -8,6 +8,9 @@ class ImportRequest extends FormRequest
 {
     const PARAM_FILE = 'file';
 
+    /**
+     * @return array<string, mixed>
+     */
     public function rules(): array
     {
         return [

src/Jobs/ExportJob.php

@@ -26,9 +26,11 @@ class ExportJob implements ShouldQueue
     use SerializesModels;
 
     private ImportExport $export;
-    private array $exportParameters;
 
-    public function __construct(ImportExport $export, array $exportParameters)
+    /**
+     * @param  array<string, mixed> $exportParameters
+     */
+    public function __construct(ImportExport $export, private array $exportParameters)
     {
         $this->export = $export;
         $this->exportParameters = $exportParameters;

src/Jobs/ImportJob.php

@@ -21,6 +21,9 @@ class ImportJob implements ShouldQueue
     use Queueable;
     use SerializesModels;
 
+    /**
+     * @param  array<string, mixed> $exportParameters
+     */
     public function __construct(
         private ImportExport $export,
         private array $exportParameters
@@ -70,7 +73,7 @@ public function handle(): void
                     ->implode(', ');
                 throw new \Exception($message);
             }
-        } catch (\Exception|\Throwable $exception) {
+        } catch (\Throwable $exception) {
             $this->export->update([
                 ImportExport::COLUMN_STATUS => ImportExportStatus::Error,
                 ImportExport::COLUMN_ERROR => $exception->getMessage(),