From 01e098a21f02bff27f654eb43fe40085d91d3324 Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Wed, 17 Jul 2024 10:37:44 +0100 Subject: [PATCH] refactor & cs --- packages/actions/src/Concerns/CanImportRecords.php | 6 +++--- .../{ImportCsvProcessed.php => ImportChunkProcessed.php} | 5 ++--- packages/actions/src/Imports/Events/ImportCompleted.php | 3 +-- .../Events/{ImportInitiated.php => ImportStarted.php} | 5 ++--- packages/actions/src/Imports/Jobs/ImportCsv.php | 6 +++--- packages/widgets/src/StatsOverviewWidget/Stat.php | 4 ++-- 6 files changed, 13 insertions(+), 16 deletions(-) rename packages/actions/src/Imports/Events/{ImportCsvProcessed.php => ImportChunkProcessed.php} (97%) rename packages/actions/src/Imports/Events/{ImportInitiated.php => ImportStarted.php} (95%) diff --git a/packages/actions/src/Concerns/CanImportRecords.php b/packages/actions/src/Concerns/CanImportRecords.php index 23c7521a82..31547e0886 100644 --- a/packages/actions/src/Concerns/CanImportRecords.php +++ b/packages/actions/src/Concerns/CanImportRecords.php @@ -6,7 +6,7 @@ use Closure; use Filament\Actions\Action; use Filament\Actions\ImportAction; use Filament\Actions\Imports\Events\ImportCompleted; -use Filament\Actions\Imports\Events\ImportInitiated; +use Filament\Actions\Imports\Events\ImportStarted; use Filament\Actions\Imports\ImportColumn; use Filament\Actions\Imports\Importer; use Filament\Actions\Imports\Jobs\ImportCsv; @@ -253,7 +253,7 @@ trait CanImportRecords options: $options, ); - event(new ImportInitiated($import, $columnMap, $options)); + event(new ImportStarted($import, $columnMap, $options)); Bus::batch($importJobs->all()) ->allowFailures() @@ -387,7 +387,7 @@ trait CanImportRecords { /** @phpstan-ignore-next-line */ $fileDisk = invade($file)->disk; - + $filePath = $file->getRealPath(); if (config("filesystems.disks.{$fileDisk}.driver") !== 's3') { diff --git a/packages/actions/src/Imports/Events/ImportCsvProcessed.php b/packages/actions/src/Imports/Events/ImportChunkProcessed.php similarity index 97% rename from packages/actions/src/Imports/Events/ImportCsvProcessed.php rename to packages/actions/src/Imports/Events/ImportChunkProcessed.php index b4d33e50e1..ec9933a998 100644 --- a/packages/actions/src/Imports/Events/ImportCsvProcessed.php +++ b/packages/actions/src/Imports/Events/ImportChunkProcessed.php @@ -6,7 +6,7 @@ use Filament\Actions\Imports\Models\Import; use Illuminate\Foundation\Events\Dispatchable; use Throwable; -class ImportCsvProcessed +class ImportChunkProcessed { use Dispatchable; @@ -22,8 +22,7 @@ class ImportCsvProcessed protected int $processedRows, protected int $successfulRows, protected array $exceptions, - ) { - } + ) {} public function getImport(): Import { diff --git a/packages/actions/src/Imports/Events/ImportCompleted.php b/packages/actions/src/Imports/Events/ImportCompleted.php index 50407050fe..17d2dd991d 100644 --- a/packages/actions/src/Imports/Events/ImportCompleted.php +++ b/packages/actions/src/Imports/Events/ImportCompleted.php @@ -17,8 +17,7 @@ class ImportCompleted protected Import $import, protected array $columnMap, protected array $options, - ) { - } + ) {} public function getImport(): Import { diff --git a/packages/actions/src/Imports/Events/ImportInitiated.php b/packages/actions/src/Imports/Events/ImportStarted.php similarity index 95% rename from packages/actions/src/Imports/Events/ImportInitiated.php rename to packages/actions/src/Imports/Events/ImportStarted.php index 2563e88b3e..76252d7d49 100644 --- a/packages/actions/src/Imports/Events/ImportInitiated.php +++ b/packages/actions/src/Imports/Events/ImportStarted.php @@ -5,7 +5,7 @@ namespace Filament\Actions\Imports\Events; use Filament\Actions\Imports\Models\Import; use Illuminate\Foundation\Events\Dispatchable; -class ImportInitiated +class ImportStarted { use Dispatchable; @@ -17,8 +17,7 @@ class ImportInitiated protected Import $import, protected array $columnMap, protected array $options, - ) { - } + ) {} public function getImport(): Import { diff --git a/packages/actions/src/Imports/Jobs/ImportCsv.php b/packages/actions/src/Imports/Jobs/ImportCsv.php index 87938594cc..43424b779a 100644 --- a/packages/actions/src/Imports/Jobs/ImportCsv.php +++ b/packages/actions/src/Imports/Jobs/ImportCsv.php @@ -4,7 +4,7 @@ namespace Filament\Actions\Imports\Jobs; use Carbon\CarbonInterface; use Exception; -use Filament\Actions\Imports\Events\ImportCsvProcessed; +use Filament\Actions\Imports\Events\ImportChunkProcessed; use Filament\Actions\Imports\Exceptions\RowImportFailedException; use Filament\Actions\Imports\Importer; use Filament\Actions\Imports\Models\FailedImportRow; @@ -111,13 +111,13 @@ class ImportCsv implements ShouldQueue $this->import->save(); - event(new ImportCsvProcessed( + event(new ImportChunkProcessed( $this->import, $this->columnMap, $this->options, $processedRows, $successfulRows, - $exceptions + $exceptions, )); $this->handleExceptions($exceptions); diff --git a/packages/widgets/src/StatsOverviewWidget/Stat.php b/packages/widgets/src/StatsOverviewWidget/Stat.php index cb40733320..68d91ac702 100644 --- a/packages/widgets/src/StatsOverviewWidget/Stat.php +++ b/packages/widgets/src/StatsOverviewWidget/Stat.php @@ -3,8 +3,8 @@ namespace Filament\Widgets\StatsOverviewWidget; use Closure; -use Filament\Support\Enums\IconPosition; use Filament\Support\Concerns\Macroable; +use Filament\Support\Enums\IconPosition; use Illuminate\Contracts\Support\Htmlable; use Illuminate\Contracts\View\View; use Illuminate\Support\Str; @@ -14,7 +14,7 @@ use Illuminate\View\ComponentAttributeBag; class Stat extends Component implements Htmlable { use Macroable; - + /** * @var array | null */