From b57f67ed11376bb5d5bc77d4f59ca78905890133 Mon Sep 17 00:00:00 2001
From: Lazizbek Ergashev <lazerg2@gmail.com>
Date: Fri, 1 Aug 2025 17:55:42 +0500
Subject: [PATCH] refactor: leverage collection helpers

---
 src/EnumNames.php         | 4 ++--
 src/EnumOptions.php       | 1 +
 src/EnumPro.php           | 1 +
 src/EnumRandom.php        | 7 ++-----
 src/EnumStaticCalls.php   | 1 +
 src/EnumValues.php        | 9 ++-------
 tests/EnumNamesTest.php   | 1 +
 tests/EnumOptionsTest.php | 1 +
 tests/EnumTest.php        | 1 +
 tests/EnumValuesTest.php  | 1 +
 10 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/EnumNames.php b/src/EnumNames.php
index 46a72c2..8e0e270 100644
--- a/src/EnumNames.php
+++ b/src/EnumNames.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Lazerg\LaravelEnumPro;
 
@@ -13,8 +14,7 @@ trait EnumNames
      */
     public static function names(): Collection
     {
-        return collect(self::cases())
-            ->map(fn($case) => $case->name);
+        return collect(self::cases())->pluck('name');
     }
 
     /**
diff --git a/src/EnumOptions.php b/src/EnumOptions.php
index 4b3576e..f7fe9d2 100644
--- a/src/EnumOptions.php
+++ b/src/EnumOptions.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Lazerg\LaravelEnumPro;
 
diff --git a/src/EnumPro.php b/src/EnumPro.php
index f0feda0..af623bf 100644
--- a/src/EnumPro.php
+++ b/src/EnumPro.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Lazerg\LaravelEnumPro;
 
diff --git a/src/EnumRandom.php b/src/EnumRandom.php
index 0b910a9..a9db622 100644
--- a/src/EnumRandom.php
+++ b/src/EnumRandom.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Lazerg\LaravelEnumPro;
 
@@ -15,11 +16,7 @@ trait EnumRandom
      */
     public static function random(int $count = 1): Collection
     {
-        if ($count > self::values()->count()) {
-            throw new InvalidArgumentException('Count of random values is greater than count of enum values');
-        }
-
-        return self::values()->shuffle()->take($count);
+        return self::values()->random($count);
     }
 
     /**
diff --git a/src/EnumStaticCalls.php b/src/EnumStaticCalls.php
index f379bd6..533926d 100644
--- a/src/EnumStaticCalls.php
+++ b/src/EnumStaticCalls.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Lazerg\LaravelEnumPro;
 
diff --git a/src/EnumValues.php b/src/EnumValues.php
index 7149681..c81c527 100644
--- a/src/EnumValues.php
+++ b/src/EnumValues.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Lazerg\LaravelEnumPro;
 
@@ -48,12 +49,6 @@ public static function valueOf(string $name): null|int|string
     {
         $name = Str::replace(' ', '_', Str::upper($name));
 
-        foreach (self::cases() as $case) {
-            if ($case->name === $name) {
-                return $case->value;
-            }
-        }
-
-        return null;
+        return array_column(self::cases(), 'value', 'name')[$name] ?? null;
     }
 }
diff --git a/tests/EnumNamesTest.php b/tests/EnumNamesTest.php
index 1c5d00f..d69490f 100644
--- a/tests/EnumNamesTest.php
+++ b/tests/EnumNamesTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 test('Get name of enums as collection', function () {
     expect(LevelTypes::names())
diff --git a/tests/EnumOptionsTest.php b/tests/EnumOptionsTest.php
index 9ad8994..e978b09 100644
--- a/tests/EnumOptionsTest.php
+++ b/tests/EnumOptionsTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 test('Get options of enum as collection', function () {
     expect(LevelTypes::options())
diff --git a/tests/EnumTest.php b/tests/EnumTest.php
index f8f36b5..4d5af13 100644
--- a/tests/EnumTest.php
+++ b/tests/EnumTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * @noinspection PhpIllegalPsrClassPathInspection
diff --git a/tests/EnumValuesTest.php b/tests/EnumValuesTest.php
index 06e5b86..3459dbb 100644
--- a/tests/EnumValuesTest.php
+++ b/tests/EnumValuesTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 test('Get values of enum as collection', function () {
     expect(LevelTypes::values())