update: static analyses checks

ousid · ousid · commit fa9760eb0649 · 2022-09-18T21:26:46.000+01:00
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -2,7 +2,7 @@ includes:
     - phpstan-baseline.neon
 
 parameters:
-    level: 4
+    level: 6
     paths:
         - src
         - config
@@ -11,4 +11,8 @@ parameters:
     checkOctaneCompatibility: true
     checkModelProperties: true
     checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
+    ignoreErrors:
+        - '#Internal error: Internal error: Target class \[laravel-csv\] does not exist.#'
+        - '#Internal error: Internal error: Target class \[livewire\] does not exist.#'
 
diff --git a/src/Http/Livewire/HandleImports.php b/src/Http/Livewire/HandleImports.php
@@ -4,6 +4,9 @@
 
 use function Coderflex\LaravelCsv\csv_view_path;
 use Coderflex\LaravelCsv\Models\Import;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Contracts\View\View;
+use Illuminate\Contracts\View\Factory;
 use Livewire\Component;
 
 class HandleImports extends Component
@@ -16,12 +19,12 @@ class HandleImports extends Component
         'imports.refresh' => '$refresh',
     ];
 
-    public function mount(string $model)
+    public function mount(string $model): void
     {
         $this->model = $model;
     }
 
-    public function getImportsProperty()
+    public function getImportsProperty(): Collection
     {
         /** @var \Illuminate\Foundation\Auth\User */
         $user = auth()->user();
@@ -34,7 +37,7 @@ public function getImportsProperty()
                     ->get();
     }
 
-    public function render()
+    public function render(): View|Factory
     {
         return view(
             csv_view_path('handle-imports')
diff --git a/src/Jobs/ImportCsv.php b/src/Jobs/ImportCsv.php
@@ -38,7 +38,7 @@ public function handle()
         $affectedRows = $this->model::upsert(
             $this->chunk,
             ['id'],
-            collect($this->columns)->diff('id')->keys()->toArray(),
+            collect($this->columns)->diff(['id'])->keys()->toArray(),
         );
 
         $this->import->increment('processed_rows', $affectedRows);
diff --git a/src/LaravelCsvDirectives.php b/src/LaravelCsvDirectives.php
@@ -4,21 +4,38 @@
 
 class LaravelCsvDirectives
 {
-    public static function csvStyles()
+    /**
+     * Get CSV Styles
+     * 
+     * @return string
+     */
+    public static function csvStyles():string|null
     {
         if (config('laravel_csv.layout') == 'tailwindcss') {
             return self::getTailwindStyle();
         }
+
+        return self::getTailwindStyle();
     }
 
-    public static function csvScripts()
+    /**
+     * Get CSV Scripts
+     * 
+     * @return string
+     */
+    public static function csvScripts(): string
     {
         return <<<'HTML'
             <script src="{{ asset('vendor/csv/js/app.js') }}"></script>
         HTML;
     }
 
-    protected static function getTailwindStyle()
+    /**
+     * Get Tailwind Style Path
+     * 
+     * @return string
+     */
+    protected static function getTailwindStyle(): string
     {
         return <<<'HTML'
                 <link href="{{ asset('vendor/csv/css/tailwind.css') }}" rel="stylesheet"></link>
diff --git a/src/LaravelCsvServiceProvider.php b/src/LaravelCsvServiceProvider.php
@@ -60,7 +60,10 @@ protected function configureComponents(): void
      */
     protected function registerLivewireComponents(): void
     {
+        /** @phpstan-ignore-next-line */
         Livewire::component('csv-importer', CsvImporter::class);
+
+        /** @phpstan-ignore-next-line */
         Livewire::component('handle-imports', HandleImports::class);
     }
 
diff --git a/src/Utilities/ChunkIterator.php b/src/Utilities/ChunkIterator.php
@@ -2,6 +2,7 @@
 
 namespace Coderflex\LaravelCsv\Utilities;
 
+use Generator;
 use Iterator;
 
 /**
@@ -35,8 +36,10 @@ public function __construct(Iterator $iterator, int $chunkSize)
 
     /**
      * Chunk the given data
+     * 
+     * @return Generator
      */
-    public function get()
+    public function get(): Generator
     {
         $chunk = [];
 
diff --git a/src/helpers.php b/src/helpers.php
@@ -9,7 +9,7 @@
      * @param  string|null  $view
      * @return string
      */
-    function csv_view_path($view): string
+    function csv_view_path(string|null $view): string
     {
         return 'laravel-csv::livewire.'.config('laravel_csv.layout').'.'.$view;
     }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,9 @@`
`4`	`4`
`5`	`5`	`use function Coderflex\LaravelCsv\csv_view_path;`
`6`	`6`	`use Coderflex\LaravelCsv\Models\Import;`
	`7`	`+use Illuminate\Database\Eloquent\Collection;`
	`8`	`+use Illuminate\Contracts\View\View;`
	`9`	`+use Illuminate\Contracts\View\Factory;`
`7`	`10`	`use Livewire\Component;`
`8`	`11`
`9`	`12`	`class HandleImports extends Component`
`@@ -16,12 +19,12 @@ class HandleImports extends Component`
`16`	`19`	`'imports.refresh' => '$refresh',`
`17`	`20`	`];`
`18`	`21`
`19`		`- public function mount(string $model)`
	`22`	`+ public function mount(string $model): void`
`20`	`23`	`{`
`21`	`24`	`$this->model = $model;`
`22`	`25`	`}`
`23`	`26`
`24`		`- public function getImportsProperty()`
	`27`	`+ public function getImportsProperty(): Collection`
`25`	`28`	`{`
`26`	`29`	`/** @var \Illuminate\Foundation\Auth\User */`
`27`	`30`	`$user = auth()->user();`
`@@ -34,7 +37,7 @@ public function getImportsProperty()`
`34`	`37`	`->get();`
`35`	`38`	`}`
`36`	`39`
`37`		`- public function render()`
	`40`	`+ public function render(): View\|Factory`
`38`	`41`	`{`
`39`	`42`	`return view(`
`40`	`43`	`csv_view_path('handle-imports')`
Original file line number	Diff line number	Diff line change
`@@ -4,21 +4,38 @@`
`4`	`4`
`5`	`5`	`class LaravelCsvDirectives`
`6`	`6`	`{`
`7`		`- public static function csvStyles()`
	`7`	`+ /**`
	`8`	`+ * Get CSV Styles`
	`9`	`+ *`
	`10`	`+ * @return string`
	`11`	`+ */`
	`12`	`+ public static function csvStyles():string\|null`
`8`	`13`	`{`
`9`	`14`	`if (config('laravel_csv.layout') == 'tailwindcss') {`
`10`	`15`	`return self::getTailwindStyle();`
`11`	`16`	`}`
	`17`	`+`
	`18`	`+ return self::getTailwindStyle();`
`12`	`19`	`}`
`13`	`20`
`14`		`- public static function csvScripts()`
	`21`	`+ /**`
	`22`	`+ * Get CSV Scripts`
	`23`	`+ *`
	`24`	`+ * @return string`
	`25`	`+ */`
	`26`	`+ public static function csvScripts(): string`
`15`	`27`	`{`
`16`	`28`	`return <<<'HTML'`
`17`	`29`	`<script src="{{ asset('vendor/csv/js/app.js') }}"></script>`
`18`	`30`	`HTML;`
`19`	`31`	`}`
`20`	`32`
`21`		`- protected static function getTailwindStyle()`
	`33`	`+ /**`
	`34`	`+ * Get Tailwind Style Path`
	`35`	`+ *`
	`36`	`+ * @return string`
	`37`	`+ */`
	`38`	`+ protected static function getTailwindStyle(): string`
`22`	`39`	`{`
`23`	`40`	`return <<<'HTML'`
`24`	`41`	`<link href="{{ asset('vendor/csv/css/tailwind.css') }}" rel="stylesheet"></link>`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,10 @@ protected function configureComponents(): void`
`60`	`60`	`*/`
`61`	`61`	`protected function registerLivewireComponents(): void`
`62`	`62`	`{`
	`63`	`+ /** @phpstan-ignore-next-line */`
`63`	`64`	`Livewire::component('csv-importer', CsvImporter::class);`
	`65`	`+`
	`66`	`+ /** @phpstan-ignore-next-line */`
`64`	`67`	`Livewire::component('handle-imports', HandleImports::class);`
`65`	`68`	`}`
`66`	`69`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* @param string\|null $view`
`10`	`10`	`* @return string`
`11`	`11`	`*/`
`12`		`- function csv_view_path($view): string`
	`12`	`+ function csv_view_path(string\|null $view): string`
`13`	`13`	`{`
`14`	`14`	`return 'laravel-csv::livewire.'.config('laravel_csv.layout').'.'.$view;`
`15`	`15`	`}`