Merge origin/main into feature/scope-attributes

Resolves conflicts in Pivot and MorphPivot by combining:
- HasGlobalScopes trait from this PR
- HasAttributes, HasCallbacks, HasObservers traits from main
- delete() method with StoppableEventInterface pattern from main

Fixes test class name collision in HasObserversTest.

Author: binaryfire

.gitignore

@@ -6,3 +6,4 @@ composer.lock
 .phpunit.result.cache
 !tests/Foundation/fixtures/hyperf1/composer.lock
 tests/Http/fixtures
+.env

phpstan.neon.dist

@@ -3,7 +3,7 @@
 #
 
 parameters:
-  level: 3
+  level: 5
   parallel:
     jobSize: 20
     maximumNumberOfProcesses: 32
@@ -26,6 +26,8 @@ parameters:
     - %currentWorkingDirectory%/src/support/src/Js.php
     - %currentWorkingDirectory%/src/notifications/src/DatabaseNotification.php
   ignoreErrors:
+    # Framework traits provided for userland - not used internally but intentionally available
+    - '#Trait Hypervel\\[A-Za-z\\\\]+ is used zero times and is not analysed\.#'
     - '#Result of method .* \(void\) is used\.#'
     - '#Unsafe usage of new static#'
     - '#Class [a-zA-Z0-9\\\\_]+ not found.#'

src/api-client/src/PendingRequest.php

@@ -155,7 +155,7 @@ public function withResource(string $resource): static
             );
         }
 
-        if (! is_subclass_of($resource, ApiResource::class)) {
+        if (! is_subclass_of($resource, ApiResource::class)) { // @phpstan-ignore function.alreadyNarrowedType (validates PHPDoc contract at runtime)
             throw new InvalidArgumentException(
                 sprintf('Resource class `%s` must be a subclass of `%s`', $resource, ApiResource::class)
             );

src/auth/src/Access/Gate.php

@@ -367,13 +367,9 @@ protected function methodAllowsGuests(mixed $class, string $method): bool
             return false;
         }
 
-        if ($method) {
-            $parameters = $method->getParameters();
+        $parameters = $method->getParameters();
 
-            return isset($parameters[0]) && $this->parameterAllowsGuests($parameters[0]);
-        }
-
-        return false;
+        return isset($parameters[0]) && $this->parameterAllowsGuests($parameters[0]);
     }
 
     /**
@@ -496,10 +492,6 @@ public function getPolicyFor(object|string $class)
             $class = get_class($class);
         }
 
-        if (! is_string($class)) {
-            return;
-        }
-
         if (isset($this->policies[$class])) {
             return $this->resolvePolicy($this->policies[$class]);
         }

src/auth/src/AuthenticationException.php

@@ -22,7 +22,7 @@ class AuthenticationException extends Exception
     /**
      * The callback that should be used to generate the authentication redirect path.
      *
-     * @var callable
+     * @var null|callable
      */
     protected static $redirectToCallback;
 

src/auth/src/Middleware/Authorize.php

@@ -50,12 +50,8 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
     /**
      * Get the arguments parameter for the gate.
      */
-    protected function getGateArguments(ServerRequestInterface $request, array $models): array|Model|string
+    protected function getGateArguments(ServerRequestInterface $request, array $models): array
     {
-        if (is_null($models)) {
-            return [];
-        }
-
         return Collection::make($models)->map(function ($model) use ($request) {
             return $model instanceof Model ? $model : $this->getModel($request, $model);
         })->all();

src/broadcasting/src/BroadcastManager.php

@@ -34,7 +34,7 @@
 use Pusher\Pusher;
 
 /**
- * @mixin \Hypervel\Broadcasting\Contracts\Broadcaster
+ * @mixin \Hypervel\Broadcasting\Broadcasters\Broadcaster
  */
 class BroadcastManager implements BroadcastingFactoryContract
 {
@@ -207,11 +207,7 @@ public function queue(mixed $event): void
      */
     protected function mustBeUniqueAndCannotAcquireLock(UniqueBroadcastEvent $event): bool
     {
-        return ! (new UniqueLock(
-            method_exists($event, 'uniqueVia')
-                ? $event->uniqueVia()
-                : $this->app->get(Cache::class)
-        ))->acquire($event);
+        return ! (new UniqueLock($event->uniqueVia()))->acquire($event);
     }
 
     /**
@@ -387,7 +383,7 @@ protected function createNullDriver(array $config): Broadcaster
      */
     protected function getConfig(string $name): ?array
     {
-        if (! is_null($name) && $name !== 'null') {
+        if ($name !== 'null') {
             return $this->app->get(ConfigInterface::class)->get("broadcasting.connections.{$name}");
         }
 

src/broadcasting/src/BroadcastPoolProxy.php

@@ -6,10 +6,21 @@
 
 use Hyperf\HttpServer\Contract\RequestInterface;
 use Hypervel\Broadcasting\Contracts\Broadcaster;
+use Hypervel\Broadcasting\Contracts\HasBroadcastChannel;
 use Hypervel\ObjectPool\PoolProxy;
 
 class BroadcastPoolProxy extends PoolProxy implements Broadcaster
 {
+    /**
+     * Register a channel authenticator.
+     */
+    public function channel(HasBroadcastChannel|string $channel, callable|string $callback, array $options = []): static
+    {
+        $this->__call(__FUNCTION__, func_get_args());
+
+        return $this;
+    }
+
     public function auth(RequestInterface $request): mixed
     {
         return $this->__call(__FUNCTION__, func_get_args());

src/broadcasting/src/Broadcasters/Broadcaster.php

@@ -73,7 +73,7 @@ public function channel(HasBroadcastChannel|string $channel, callable|string $ca
     {
         if ($channel instanceof HasBroadcastChannel) {
             $channel = $channel->broadcastChannelRoute();
-        } elseif (is_string($channel) && class_exists($channel) && is_a($channel, HasBroadcastChannel::class, true)) {
+        } elseif (class_exists($channel) && is_a($channel, HasBroadcastChannel::class, true)) {
             $channel = (new $channel())->broadcastChannelRoute();
         }
 
@@ -134,11 +134,11 @@ protected function extractAuthParameters(string $pattern, string $channel, calla
      */
     protected function extractParameters(callable|string $callback): array
     {
-        return match (true) {
-            is_callable($callback) => (new ReflectionFunction($callback))->getParameters(),
-            is_string($callback) => $this->extractParametersFromClass($callback),
-            default => [],
-        };
+        if (is_callable($callback)) {
+            return (new ReflectionFunction($callback))->getParameters();
+        }
+
+        return $this->extractParametersFromClass($callback);
     }
 
     /**

src/broadcasting/src/Broadcasters/PusherBroadcaster.php

@@ -38,7 +38,7 @@ public function resolveAuthenticatedUser(RequestInterface $request): ?array
             return null;
         }
 
-        if (method_exists($this->pusher, 'authenticateUser')) {
+        if (method_exists($this->pusher, 'authenticateUser')) { // @phpstan-ignore function.alreadyNarrowedType (Pusher 6.x compatibility)
             return json_decode(
                 $this->pusher->authenticateUser($request->input('socket_id'), $user),
                 true,