Merge pull request #32 from yajra/fix31

yajra · web-flow · commit 0f384b0f70cd · 2022-10-06T13:18:04.000+08:00
Fix phpstan
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
   },
   "require-dev": {
     "maatwebsite/excel": "^3.1.40",
-    "nunomaduro/larastan": "^1.0|^2.1",
+    "nunomaduro/larastan": "^1.0|2.1.12",
     "orchestra/testbench": "6.*|^7.3"
   },
   "autoload": {
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -10,6 +10,8 @@ parameters:
 
     ignoreErrors:
         - '#Parameter \#1 \$callback of method Illuminate\\Container\\Container::call\(\) expects \(callable\(\): mixed\)\|string*#'
+        - '#Parameter \#2 \$needles of static method Illuminate\\Support\\Str::endsWith*#'
+        - '#Parameter \#2 \$needles of static method Illuminate\\Support\\Str::contains*#'
 
     excludePaths:
         - tests
diff --git a/src/ExportServiceProvider.php b/src/ExportServiceProvider.php
@@ -16,7 +16,9 @@ public function boot(): void
 
         $this->publishAssets();
 
-        Livewire::component('export-button', ExportButtonComponent::class);
+        if (! $this->app->runningInConsole()) {
+            Livewire::component('export-button', ExportButtonComponent::class);
+        }
     }
 
     protected function publishAssets(): void
diff --git a/src/Jobs/DataTableExportJob.php b/src/Jobs/DataTableExportJob.php
@@ -142,6 +142,7 @@ public function handle()
                     $property = $property['_'] ?? $column->name;
                 }
 
+                /** @var array|bool|int|string|null $value */
                 $value = $row[$property] ?? '';
 
                 if (is_array($value)) {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,9 @@ public function boot(): void`
`16`	`16`
`17`	`17`	`$this->publishAssets();`
`18`	`18`
`19`		`- Livewire::component('export-button', ExportButtonComponent::class);`
	`19`	`+ if (! $this->app->runningInConsole()) {`
	`20`	`+ Livewire::component('export-button', ExportButtonComponent::class);`
	`21`	`+ }`
`20`	`22`	`}`
`21`	`23`
`22`	`24`	`protected function publishAssets(): void`
Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,7 @@ public function handle()`
`142`	`142`	`$property = $property['_'] ?? $column->name;`
`143`	`143`	`}`
`144`	`144`
	`145`	`+ /** @var array\|bool\|int\|string\|null $value */`
`145`	`146`	`$value = $row[$property] ?? '';`
`146`	`147`
`147`	`148`	`if (is_array($value)) {`