feat: port framework enum support from Laravel

phpstan.neon.dist

@@ -45,6 +45,7 @@ parameters:
     - '#Call to an undefined method Hyperf\\Tappable\\HigherOrderTapProxy#'
     - message: '#.*#'
       paths:
+        - src/support/src/Collection.php
         - src/core/src/Database/Eloquent/Builder.php
         - src/core/src/Database/Eloquent/Collection.php
         - src/core/src/Database/Eloquent/Concerns/HasRelationships.php

src/auth/src/Access/AuthorizesRequests.php

@@ -8,6 +8,8 @@
 use Hypervel\Auth\Contracts\Authenticatable;
 use Hypervel\Auth\Contracts\Gate;
 
+use function Hypervel\Support\enum_value;
+
 trait AuthorizesRequests
 {
     /**
@@ -39,6 +41,8 @@ public function authorizeForUser(?Authenticatable $user, mixed $ability, mixed $
      */
     protected function parseAbilityAndArguments(mixed $ability, mixed $arguments = []): array
     {
+        $ability = enum_value($ability);
+
         if (is_string($ability) && ! str_contains($ability, '\\')) {
             return [$ability, $arguments];
         }

src/auth/src/Access/Gate.php

@@ -20,6 +20,9 @@
 use ReflectionException;
 use ReflectionFunction;
 use ReflectionParameter;
+use UnitEnum;
+
+use function Hypervel\Support\enum_value;
 
 class Gate implements GateContract
 {
@@ -58,12 +61,12 @@ public function __construct(
     /**
      * Determine if a given ability has been defined.
      */
-    public function has(array|string $ability): bool
+    public function has(array|UnitEnum|string $ability): bool
     {
         $abilities = is_array($ability) ? $ability : func_get_args();
 
         foreach ($abilities as $ability) {
-            if (! isset($this->abilities[$ability])) {
+            if (! isset($this->abilities[enum_value($ability)])) {
                 return false;
             }
         }
@@ -120,8 +123,10 @@ protected function authorizeOnDemand(bool|Closure|Response $condition, ?string $
      *
      * @throws InvalidArgumentException
      */
-    public function define(string $ability, array|callable|string $callback): static
+    public function define(UnitEnum|string $ability, array|callable|string $callback): static
     {
+        $ability = enum_value($ability);
+
         if (is_array($callback) && isset($callback[0]) && is_string($callback[0])) {
             $callback = $callback[0] . '@' . $callback[1];
         }
@@ -227,23 +232,23 @@ public function after(callable $callback): static
     /**
      * Determine if the given ability should be granted for the current user.
      */
-    public function allows(string $ability, mixed $arguments = []): bool
+    public function allows(UnitEnum|string $ability, mixed $arguments = []): bool
     {
         return $this->check($ability, $arguments);
     }
 
     /**
      * Determine if the given ability should be denied for the current user.
      */
-    public function denies(string $ability, mixed $arguments = []): bool
+    public function denies(UnitEnum|string $ability, mixed $arguments = []): bool
     {
         return ! $this->allows($ability, $arguments);
     }
 
     /**
      * Determine if all of the given abilities should be granted for the current user.
      */
-    public function check(iterable|string $abilities, mixed $arguments = []): bool
+    public function check(iterable|UnitEnum|string $abilities, mixed $arguments = []): bool
     {
         return collect($abilities)->every(
             fn ($ability) => $this->inspect($ability, $arguments)->allowed()
@@ -253,15 +258,15 @@ public function check(iterable|string $abilities, mixed $arguments = []): bool
     /**
      * Determine if any one of the given abilities should be granted for the current user.
      */
-    public function any(iterable|string $abilities, mixed $arguments = []): bool
+    public function any(iterable|UnitEnum|string $abilities, mixed $arguments = []): bool
     {
         return collect($abilities)->contains(fn ($ability) => $this->check($ability, $arguments));
     }
 
     /**
      * Determine if all of the given abilities should be denied for the current user.
      */
-    public function none(iterable|string $abilities, mixed $arguments = []): bool
+    public function none(iterable|UnitEnum|string $abilities, mixed $arguments = []): bool
     {
         return ! $this->any($abilities, $arguments);
     }
@@ -271,18 +276,18 @@ public function none(iterable|string $abilities, mixed $arguments = []): bool
      *
      * @throws AuthorizationException
      */
-    public function authorize(string $ability, mixed $arguments = []): Response
+    public function authorize(UnitEnum|string $ability, mixed $arguments = []): Response
     {
         return $this->inspect($ability, $arguments)->authorize();
     }
 
     /**
      * Inspect the user for the given ability.
      */
-    public function inspect(string $ability, mixed $arguments = []): Response
+    public function inspect(UnitEnum|string $ability, mixed $arguments = []): Response
     {
         try {
-            $result = $this->raw($ability, $arguments);
+            $result = $this->raw(enum_value($ability), $arguments);
 
             if ($result instanceof Response) {
                 return $result;

src/auth/src/Contracts/Gate.php

@@ -7,18 +7,19 @@
 use Hypervel\Auth\Access\AuthorizationException;
 use Hypervel\Auth\Access\Response;
 use InvalidArgumentException;
+use UnitEnum;
 
 interface Gate
 {
     /**
      * Determine if a given ability has been defined.
      */
-    public function has(string $ability): bool;
+    public function has(array|UnitEnum|string $ability): bool;
 
     /**
      * Define a new ability.
      */
-    public function define(string $ability, callable|string $callback): static;
+    public function define(UnitEnum|string $ability, callable|string $callback): static;
 
     /**
      * Define abilities for a resource.
@@ -43,34 +44,39 @@ public function after(callable $callback): static;
     /**
      * Determine if the given ability should be granted for the current user.
      */
-    public function allows(string $ability, mixed $arguments = []): bool;
+    public function allows(UnitEnum|string $ability, mixed $arguments = []): bool;
 
     /**
      * Determine if the given ability should be denied for the current user.
      */
-    public function denies(string $ability, mixed $arguments = []): bool;
+    public function denies(UnitEnum|string $ability, mixed $arguments = []): bool;
 
     /**
      * Determine if all of the given abilities should be granted for the current user.
      */
-    public function check(iterable|string $abilities, mixed $arguments = []): bool;
+    public function check(iterable|UnitEnum|string $abilities, mixed $arguments = []): bool;
 
     /**
      * Determine if any one of the given abilities should be granted for the current user.
      */
-    public function any(iterable|string $abilities, mixed $arguments = []): bool;
+    public function any(iterable|UnitEnum|string $abilities, mixed $arguments = []): bool;
+
+    /**
+     * Determine if all of the given abilities should be denied for the current user.
+     */
+    public function none(iterable|UnitEnum|string $abilities, mixed $arguments = []): bool;
 
     /**
      * Determine if the given ability should be granted for the current user.
      *
      * @throws AuthorizationException
      */
-    public function authorize(string $ability, mixed $arguments = []): Response;
+    public function authorize(UnitEnum|string $ability, mixed $arguments = []): Response;
 
     /**
      * Inspect the user for the given ability.
      */
-    public function inspect(string $ability, mixed $arguments = []): Response;
+    public function inspect(UnitEnum|string $ability, mixed $arguments = []): Response;
 
     /**
      * Get the raw result from the authorization callback.

src/auth/src/Middleware/Authorize.php

@@ -13,6 +13,9 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use UnitEnum;
+
+use function Hypervel\Support\enum_value;
 
 class Authorize implements MiddlewareInterface
 {
@@ -28,9 +31,9 @@ public function __construct(protected Gate $gate)
     /**
      * Specify the ability and models for the middleware.
      */
-    public static function using(string $ability, string ...$models): string
+    public static function using(UnitEnum|string $ability, string ...$models): string
     {
-        return static::class . ':' . implode(',', [$ability, ...$models]);
+        return static::class . ':' . implode(',', [enum_value($ability), ...$models]);
     }
 
     /**

src/broadcasting/src/InteractsWithBroadcasting.php

@@ -5,6 +5,9 @@
 namespace Hypervel\Broadcasting;
 
 use Hyperf\Collection\Arr;
+use UnitEnum;
+
+use function Hypervel\Support\enum_value;
 
 trait InteractsWithBroadcasting
 {
@@ -16,8 +19,10 @@ trait InteractsWithBroadcasting
     /**
      * Broadcast the event using a specific broadcaster.
      */
-    public function broadcastVia(array|string|null $connection = null): static
+    public function broadcastVia(UnitEnum|array|string|null $connection = null): static
     {
+        $connection = is_null($connection) ? null : enum_value($connection);
+
         $this->broadcastConnection = is_null($connection)
             ? [null]
             : Arr::wrap($connection);

src/broadcasting/src/PendingBroadcast.php

@@ -5,6 +5,7 @@
 namespace Hypervel\Broadcasting;
 
 use Psr\EventDispatcher\EventDispatcherInterface;
+use UnitEnum;
 
 class PendingBroadcast
 {
@@ -20,7 +21,7 @@ public function __construct(
     /**
      * Broadcast the event using a specific broadcaster.
      */
-    public function via(?string $connection = null): static
+    public function via(UnitEnum|string|null $connection = null): static
     {
         if (method_exists($this->event, 'broadcastVia')) {
             $this->event->broadcastVia($connection);

src/bus/src/PendingBatch.php

@@ -4,7 +4,6 @@
 
 namespace Hypervel\Bus;
 
-use BackedEnum;
 use Closure;
 use Hyperf\Collection\Arr;
 use Hyperf\Collection\Collection;
@@ -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;
@@ -194,9 +194,9 @@ public function name(string $name): static
     /**
      * Specify the queue connection that the batched jobs should run on.
      */
-    public function onConnection(string $connection): static
+    public function onConnection(UnitEnum|string $connection): static
     {
-        $this->options['connection'] = $connection;
+        $this->options['connection'] = enum_value($connection);
 
         return $this;
     }
@@ -212,7 +212,7 @@ public function connection(): ?string
     /**
      * Specify the queue that the batched jobs should run on.
      */
-    public function onQueue(BackedEnum|string|null $queue): static
+    public function onQueue(UnitEnum|string|null $queue): static
     {
         $this->options['queue'] = enum_value($queue);
 

src/bus/src/PendingChain.php

@@ -4,7 +4,6 @@
 
 namespace Hypervel\Bus;
 
-use BackedEnum;
 use Closure;
 use DateInterval;
 use DateTimeInterface;
@@ -13,6 +12,7 @@
 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;
@@ -56,17 +56,17 @@ public function __construct(
     /**
      * Set the desired connection for the job.
      */
-    public function onConnection(?string $connection): static
+    public function onConnection(UnitEnum|string|null $connection): static
     {
-        $this->connection = $connection;
+        $this->connection = enum_value($connection);
 
         return $this;
     }
 
     /**
      * Set the desired queue for the job.
      */
-    public function onQueue(BackedEnum|string|null $queue): static
+    public function onQueue(UnitEnum|string|null $queue): static
     {
         $this->queue = enum_value($queue);
 

src/bus/src/PendingDispatch.php

@@ -4,13 +4,13 @@
 
 namespace Hypervel\Bus;
 
-use BackedEnum;
 use DateInterval;
 use DateTimeInterface;
 use Hyperf\Context\ApplicationContext;
 use Hypervel\Bus\Contracts\Dispatcher;
 use Hypervel\Cache\Contracts\Factory as CacheFactory;
 use Hypervel\Queue\Contracts\ShouldBeUnique;
+use UnitEnum;
 
 class PendingDispatch
 {
@@ -30,7 +30,7 @@ public function __construct(
     /**
      * Set the desired connection for the job.
      */
-    public function onConnection(BackedEnum|string|null $connection): static
+    public function onConnection(UnitEnum|string|null $connection): static
     {
         $this->job->onConnection($connection);
 
@@ -40,7 +40,7 @@ public function onConnection(BackedEnum|string|null $connection): static
     /**
      * Set the desired queue for the job.
      */
-    public function onQueue(BackedEnum|string|null $queue): static
+    public function onQueue(UnitEnum|string|null $queue): static
     {
         $this->job->onQueue($queue);
 
@@ -50,7 +50,7 @@ public function onQueue(BackedEnum|string|null $queue): static
     /**
      * Set the desired connection for the chain.
      */
-    public function allOnConnection(BackedEnum|string|null $connection): static
+    public function allOnConnection(UnitEnum|string|null $connection): static
     {
         $this->job->allOnConnection($connection);
 
@@ -60,7 +60,7 @@ public function allOnConnection(BackedEnum|string|null $connection): static
     /**
      * Set the desired queue for the chain.
      */
-    public function allOnQueue(BackedEnum|string|null $queue): static
+    public function allOnQueue(UnitEnum|string|null $queue): static
     {
         $this->job->allOnQueue($queue);