From a33ca0c5960407641db4028d405bebb85fef4677 Mon Sep 17 00:00:00 2001 From: ALIN <=> Date: Thu, 17 Apr 2025 14:02:09 +0300 Subject: [PATCH 1/2] upgraded to native enums --- src/EnumServiceProvider.php | 7 +------ src/Enums/IOStatus.php | 17 +++++++++++++++++ src/Enums/IOStatuses.php | 12 ------------ src/Enums/IOType.php | 27 +++++++++++++++++++++++++++ src/Enums/IOTypes.php | 18 ------------------ src/Events/IOEvent.php | 7 +++---- 6 files changed, 48 insertions(+), 40 deletions(-) create mode 100644 src/Enums/IOStatus.php delete mode 100644 src/Enums/IOStatuses.php create mode 100644 src/Enums/IOType.php delete mode 100644 src/Enums/IOTypes.php diff --git a/src/EnumServiceProvider.php b/src/EnumServiceProvider.php index 423053a..f4433d0 100644 --- a/src/EnumServiceProvider.php +++ b/src/EnumServiceProvider.php @@ -3,13 +3,8 @@ namespace LaravelEnso\IO; use LaravelEnso\Enums\EnumServiceProvider as ServiceProvider; -use LaravelEnso\IO\Enums\IOStatuses; -use LaravelEnso\IO\Enums\IOTypes; class EnumServiceProvider extends ServiceProvider { - public $register = [ - 'ioStatuses' => IOStatuses::class, - 'ioTypes' => IOTypes::class, - ]; + public $register = []; } diff --git a/src/Enums/IOStatus.php b/src/Enums/IOStatus.php new file mode 100644 index 0000000..f9d52e6 --- /dev/null +++ b/src/Enums/IOStatus.php @@ -0,0 +1,17 @@ + 'import', + self::Export => 'export', + self::Task => 'task', + }; + } +} diff --git a/src/Enums/IOTypes.php b/src/Enums/IOTypes.php deleted file mode 100644 index 04e2000..0000000 --- a/src/Enums/IOTypes.php +++ /dev/null @@ -1,18 +0,0 @@ - 'import', - self::Export => 'export', - self::Task => 'task', - ]; -} diff --git a/src/Events/IOEvent.php b/src/Events/IOEvent.php index 43a7518..fd00b97 100644 --- a/src/Events/IOEvent.php +++ b/src/Events/IOEvent.php @@ -7,8 +7,7 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Facades\App; -use LaravelEnso\IO\Enums\IOTypes; +use LaravelEnso\IO\Enums\IOType; use LaravelEnso\IO\Http\Resources\IO; class IOEvent implements ShouldBroadcast @@ -46,11 +45,11 @@ public function broadcastWith() public function broadcastAs() { - return App::make(IOTypes::class)::get($this->operation->operationType()); + return IOType::from($this->operation->operationType())->map(); } private function inferiorRole(): bool { - return ! $this->operation->createdBy?->isSuperior(); + return !$this->operation->createdBy?->isSuperior(); } } From c21e601d6cfe59f7f4487a636199243574f2aa01 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Thu, 17 Apr 2025 11:02:30 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI --- src/Events/IOEvent.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Events/IOEvent.php b/src/Events/IOEvent.php index fd00b97..d3a0e0e 100644 --- a/src/Events/IOEvent.php +++ b/src/Events/IOEvent.php @@ -50,6 +50,6 @@ public function broadcastAs() private function inferiorRole(): bool { - return !$this->operation->createdBy?->isSuperior(); + return ! $this->operation->createdBy?->isSuperior(); } }