Use enum_value() for Sanctum token abilities

Replace Str::from() and Str::fromAll() with enum_value() for consistency
with other enum-supporting APIs across the codebase. Also updates type
hints from BackedEnum to UnitEnum to match the established pattern.

Author: binaryfire

src/bus/src/PendingBatch.php

@@ -6,7 +6,6 @@
 
 use Closure;
 use Hyperf\Collection\Arr;
-use UnitEnum;
 use Hyperf\Collection\Collection;
 use Hyperf\Conditionable\Conditionable;
 use Hyperf\Coroutine\Coroutine;
@@ -17,6 +16,7 @@
 use Psr\Container\ContainerInterface;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Throwable;
+use UnitEnum;
 
 use function Hyperf\Support\value;
 use function Hypervel\Support\enum_value;

src/bus/src/PendingChain.php

@@ -7,12 +7,12 @@
 use Closure;
 use DateInterval;
 use DateTimeInterface;
-use UnitEnum;
 use Hyperf\Conditionable\Conditionable;
 use Hyperf\Context\ApplicationContext;
 use Hypervel\Bus\Contracts\Dispatcher;
 use Hypervel\Queue\CallQueuedClosure;
 use Laravel\SerializableClosure\SerializableClosure;
+use UnitEnum;
 
 use function Hyperf\Support\value;
 use function Hypervel\Support\enum_value;

src/bus/src/PendingDispatch.php

@@ -7,10 +7,10 @@
 use DateInterval;
 use DateTimeInterface;
 use Hyperf\Context\ApplicationContext;
-use UnitEnum;
 use Hypervel\Bus\Contracts\Dispatcher;
 use Hypervel\Cache\Contracts\Factory as CacheFactory;
 use Hypervel\Queue\Contracts\ShouldBeUnique;
+use UnitEnum;
 
 class PendingDispatch
 {

src/sanctum/src/Contracts/HasAbilities.php

@@ -4,17 +4,17 @@
 
 namespace Hypervel\Sanctum\Contracts;
 
-use BackedEnum;
+use UnitEnum;
 
 interface HasAbilities
 {
     /**
      * Determine if the token has a given ability.
      */
-    public function can(BackedEnum|string $ability): bool;
+    public function can(UnitEnum|string $ability): bool;
 
     /**
      * Determine if the token is missing a given ability.
      */
-    public function cant(BackedEnum|string $ability): bool;
+    public function cant(UnitEnum|string $ability): bool;
 }

src/sanctum/src/Contracts/HasApiTokens.php

@@ -4,9 +4,9 @@
 
 namespace Hypervel\Sanctum\Contracts;
 
-use BackedEnum;
 use DateTimeInterface;
 use Hyperf\Database\Model\Relations\MorphMany;
+use UnitEnum;
 
 interface HasApiTokens
 {
@@ -18,17 +18,17 @@ public function tokens(): MorphMany;
     /**
      * Determine if the current API token has a given ability.
      */
-    public function tokenCan(BackedEnum|string $ability): bool;
+    public function tokenCan(UnitEnum|string $ability): bool;
 
     /**
      * Determine if the current API token is missing a given ability.
      */
-    public function tokenCant(BackedEnum|string $ability): bool;
+    public function tokenCant(UnitEnum|string $ability): bool;
 
     /**
      * Create a new personal access token for the user.
      *
-     * @param array<BackedEnum|string> $abilities
+     * @param array<string|UnitEnum> $abilities
      */
     public function createToken(string $name, array $abilities = ['*'], ?DateTimeInterface $expiresAt = null): \Hypervel\Sanctum\NewAccessToken;
 

src/sanctum/src/HasApiTokens.php

@@ -4,11 +4,12 @@
 
 namespace Hypervel\Sanctum;
 
-use BackedEnum;
 use DateTimeInterface;
 use Hyperf\Database\Model\Relations\MorphMany;
 use Hypervel\Sanctum\Contracts\HasAbilities;
-use Hypervel\Support\Str;
+use UnitEnum;
+
+use function Hypervel\Support\enum_value;
 
 /**
  * @template TToken of \Hypervel\Sanctum\Contracts\HasAbilities = \Hypervel\Sanctum\PersonalAccessToken
@@ -35,27 +36,27 @@ public function tokens(): MorphMany
     /**
      * Determine if the current API token has a given ability.
      */
-    public function tokenCan(BackedEnum|string $ability): bool
+    public function tokenCan(UnitEnum|string $ability): bool
     {
         return $this->accessToken && $this->accessToken->can($ability);
     }
 
     /**
      * Determine if the current API token does not have a given ability.
      */
-    public function tokenCant(BackedEnum|string $ability): bool
+    public function tokenCant(UnitEnum|string $ability): bool
     {
         return ! $this->tokenCan($ability);
     }
 
     /**
      * Create a new personal access token for the user.
      *
-     * @param array<BackedEnum|string> $abilities
+     * @param array<string|UnitEnum> $abilities
      */
     public function createToken(string $name, array $abilities = ['*'], ?DateTimeInterface $expiresAt = null): NewAccessToken
     {
-        $abilities = Str::fromAll($abilities);
+        $abilities = array_map(enum_value(...), $abilities);
 
         $plainTextToken = $this->generateTokenString();
 

src/sanctum/src/PersonalAccessToken.php

@@ -4,7 +4,6 @@
 
 namespace Hypervel\Sanctum;
 
-use BackedEnum;
 use Hyperf\Database\Model\Events\Deleting;
 use Hyperf\Database\Model\Events\Updating;
 use Hyperf\Database\Model\Relations\MorphTo;
@@ -14,7 +13,9 @@
 use Hypervel\Context\ApplicationContext;
 use Hypervel\Database\Eloquent\Model;
 use Hypervel\Sanctum\Contracts\HasAbilities;
-use Hypervel\Support\Str;
+use UnitEnum;
+
+use function Hypervel\Support\enum_value;
 
 /**
  * @property int|string $id
@@ -154,9 +155,9 @@ public static function findTokenable(PersonalAccessToken $accessToken): ?Authent
     /**
      * Determine if the token has a given ability.
      */
-    public function can(BackedEnum|string $ability): bool
+    public function can(UnitEnum|string $ability): bool
     {
-        $ability = Str::from($ability);
+        $ability = enum_value($ability);
 
         return in_array('*', $this->abilities)
                || array_key_exists($ability, array_flip($this->abilities));
@@ -165,7 +166,7 @@ public function can(BackedEnum|string $ability): bool
     /**
      * Determine if the token is missing a given ability.
      */
-    public function cant(BackedEnum|string $ability): bool
+    public function cant(UnitEnum|string $ability): bool
     {
         return ! $this->can($ability);
     }

src/sanctum/src/TransientToken.php

@@ -4,23 +4,23 @@
 
 namespace Hypervel\Sanctum;
 
-use BackedEnum;
 use Hypervel\Sanctum\Contracts\HasAbilities;
+use UnitEnum;
 
 class TransientToken implements HasAbilities
 {
     /**
      * Determine if the token has a given ability.
      */
-    public function can(BackedEnum|string $ability): bool
+    public function can(UnitEnum|string $ability): bool
     {
         return true;
     }
 
     /**
      * Determine if the token is missing a given ability.
      */
-    public function cant(BackedEnum|string $ability): bool
+    public function cant(UnitEnum|string $ability): bool
     {
         return false;
     }

tests/Broadcasting/InteractsWithBroadcastingTest.php

@@ -10,6 +10,7 @@
 use Hypervel\Broadcasting\InteractsWithBroadcasting;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
+use TypeError;
 
 enum InteractsWithBroadcastingTestConnectionStringEnum: string
 {
@@ -105,7 +106,7 @@ public function testBroadcastWithIntBackedEnumThrowsTypeErrorAtBroadcastTime():
         $manager = m::mock(BroadcastingFactory::class);
 
         // TypeError is thrown when BroadcastManager::connection() receives int instead of ?string
-        $this->expectException(\TypeError::class);
+        $this->expectException(TypeError::class);
         $broadcastEvent->handle($manager);
     }
 }

tests/Broadcasting/PendingBroadcastTest.php

@@ -12,6 +12,7 @@
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
 use Psr\EventDispatcher\EventDispatcherInterface;
+use TypeError;
 
 enum PendingBroadcastTestConnectionStringEnum: string
 {
@@ -78,7 +79,7 @@ public function testViaWithIntBackedEnumThrowsTypeErrorAtBroadcastTime(): void
         $manager = m::mock(BroadcastingFactory::class);
 
         // TypeError is thrown when BroadcastManager::connection() receives int instead of ?string
-        $this->expectException(\TypeError::class);
+        $this->expectException(TypeError::class);
         $broadcastEvent->handle($manager);
     }