chore: increase PHPStan level from 3 to 5

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

@@ -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/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,

src/bus/src/PendingBatch.php

@@ -275,9 +275,7 @@ public function dispatchAfterResponse(): Batch
 
         $batch = $this->store($repository);
 
-        if ($batch) {
-            Coroutine::defer(fn () => $this->dispatchExistingBatch($batch));
-        }
+        Coroutine::defer(fn () => $this->dispatchExistingBatch($batch));
 
         return $batch;
     }

src/cache/src/CacheManager.php

@@ -326,7 +326,7 @@ protected function getPrefix(array $config): string
      */
     protected function getConfig(string $name): ?array
     {
-        if (! is_null($name) && $name !== 'null') {
+        if ($name !== 'null') {
             return $this->app->get(ConfigInterface::class)->get("cache.stores.{$name}");
         }
 

src/cache/src/Console/ClearCommand.php

@@ -35,11 +35,9 @@ public function handle(): ?int
         $this->app->get(EventDispatcherInterface::class)
             ->dispatch('cache:clearing', [$this->argument('store'), $this->tags()]);
 
-        if (method_exists($store = $this->cache()->getStore(), 'flush')) {
-            if (! $store->flush()) {
-                $this->error('Failed to clear cache. Make sure you have the appropriate permissions.');
-                return 1;
-            }
+        if (! $this->cache()->getStore()->flush()) {
+            $this->error('Failed to clear cache. Make sure you have the appropriate permissions.');
+            return 1;
         }
 
         $this->flushRuntime();

src/cache/src/DatabaseStore.php

@@ -104,16 +104,12 @@ public function many(array $keys): array
         $results = array_fill_keys($keys, null);
 
         // First we will retrieve all of the items from the cache using their keys and
-        // the prefix value. Then we will need to iterate through each of the items
-        // and convert them to an object when they are currently in array format.
+        // the prefix value.
         $values = $this->table()
             ->whereIn('key', array_map(function ($key) {
                 return $this->prefix . $key;
             }, $keys))
-            ->get()
-            ->map(function ($value) {
-                return is_array($value) ? (object) $value : $value;
-            });
+            ->get();
 
         $currentTime = $this->currentTime();
 

src/cache/src/FileStore.php

@@ -88,7 +88,7 @@ public function add(string $key, mixed $value, int $seconds): bool
 
         try {
             $file->getExclusiveLock();
-        } catch (LockTimeoutException) {
+        } catch (LockTimeoutException) { // @phpstan-ignore catch.neverThrown (thrown inside closure)
             $file->close();
 
             return false;

src/cache/src/Functions.php

@@ -30,7 +30,7 @@ function cache($key = null, $default = null)
         return $manager->get($key, $default);
     }
 
-    if (! is_array($key)) {
+    if (! is_array($key)) { // @phpstan-ignore function.alreadyNarrowedType (validates PHPDoc contract at runtime)
         throw new InvalidArgumentException(
             'When setting a value in the cache, you must pass an array of key / value pairs.'
         );

src/cache/src/RedisStore.php

@@ -248,8 +248,8 @@ public function setPrefix(string $prefix): void
      */
     protected function serialize(mixed $value): mixed
     {
-        // is_nan() doesn't work in strict mode
-        return is_numeric($value) && ! in_array($value, [INF, -INF]) && ($value === $value) ? $value : serialize($value);
+        // is_nan() doesn't work in strict mode; NaN is the only value where $v !== $v
+        return is_numeric($value) && ! in_array($value, [INF, -INF]) && ($value === $value) ? $value : serialize($value); // @phpstan-ignore identical.alwaysTrue
     }
 
     /**

src/cache/src/RedisTagSet.php

@@ -25,7 +25,7 @@ public function addEntry(string $key, int $ttl = 0, ?string $updateWhen = null):
 
         foreach ($this->tagIds() as $tagKey) {
             if ($updateWhen) {
-                $this->store->connection()->zadd($this->store->getPrefix() . $tagKey, $updateWhen, $ttl, $key);
+                $this->store->connection()->zadd($this->store->getPrefix() . $tagKey, $updateWhen, $ttl, $key); // @phpstan-ignore argument.type
             } else {
                 $this->store->connection()->zadd($this->store->getPrefix() . $tagKey, $ttl, $key);
             }

src/cache/src/SwooleTableManager.php

@@ -54,7 +54,7 @@ protected function resolve(string $name): Table
 
     protected function getConfig(string $name): ?array
     {
-        if (! is_null($name) && $name !== 'null') {
+        if ($name !== 'null') {
             return $this->app->get(ConfigInterface::class)->get("cache.swoole_tables.{$name}");
         }
 

src/config/src/ProviderConfig.php

@@ -36,9 +36,9 @@ public static function load(): array
 
         $providers = array_map(
             fn (array $package) => array_merge(
-                Arr::wrap(($package['hyperf']['config'] ?? []) ?? []),
-                Arr::wrap(($package['hypervel']['config'] ?? []) ?? []),
-                Arr::wrap(($package['hypervel']['providers'] ?? []) ?? []),
+                Arr::wrap($package['hyperf']['config'] ?? []),
+                Arr::wrap($package['hypervel']['config'] ?? []),
+                Arr::wrap($package['hypervel']['providers'] ?? []),
             ),
             Composer::getMergedExtra()
         );

src/console/src/Commands/ScheduleListCommand.php

@@ -73,9 +73,9 @@ public function handle()
             return $this->listEvent($event, $terminalWidth, $expressionSpacing, $repeatExpressionSpacing, $timezone);
         });
 
-        $this->line(
-            $events->flatten()->filter()->prepend('')->push('')->toArray()
-        );
+        foreach ($events->flatten()->filter()->prepend('')->push('')->toArray() as $line) {
+            $this->line($line);
+        }
     }
 
     /**

src/console/src/Scheduling/Event.php

@@ -706,12 +706,12 @@ public function mutexName(): string
     {
         $mutexNameResolver = $this->mutexNameResolver;
 
-        if (! is_null($mutexNameResolver) && is_callable($mutexNameResolver)) {
+        if (! is_null($mutexNameResolver)) {
             return $mutexNameResolver($this);
         }
 
         return 'framework' . DIRECTORY_SEPARATOR . 'schedule-'
-            . sha1($this->expression . $this->command ?? '');
+            . sha1($this->expression . ($this->command ?? ''));
     }
 
     /**

src/console/src/Scheduling/Schedule.php

@@ -380,7 +380,7 @@ protected function getDispatcher(): Dispatcher
             } catch (BindingResolutionException $e) {
                 throw new RuntimeException(
                     'Unable to resolve the dispatcher from the service container. Please bind it or install the hypervel/bus package.',
-                    is_int($e->getCode()) ? $e->getCode() : 0,
+                    $e->getCode(),
                     $e
                 );
             }

src/container/src/BoundMethod.php

@@ -40,8 +40,8 @@ public static function call(ContainerContract $container, $callback, array $para
         }
 
         // object method call
-        if (is_object($callback) && method_exists($callback, $defaultMethod ?: '__invoke')) {
-            $callback = [$callback, $defaultMethod ?: '__invoke'];
+        if (is_object($callback) && method_exists($callback, '__invoke')) {
+            $callback = [$callback, '__invoke'];
         }
 
         // static method call

src/container/src/Container.php

@@ -582,6 +582,7 @@ protected function fireAfterResolvingCallbacks($abstract, $object): void
      *
      * @param string $abstract
      * @param object $object
+     * @param array<class-string, array> $callbacksPerType
      */
     protected function getCallbacksForType($abstract, $object, array $callbacksPerType): array
     {
@@ -681,23 +682,21 @@ public function flush(): void
      */
     public static function getInstance(): ContainerContract
     {
-        if (is_null(ApplicationContext::getContainer())) {
+        if (! ApplicationContext::hasContainer()) {
             ApplicationContext::setContainer(
                 new static(new DefinitionSource([]))
             );
         }
 
-        /* @phpstan-ignore-next-line */
-        return ApplicationContext::getContainer();
+        return ApplicationContext::getContainer(); // @phpstan-ignore return.type (we just set it with static() above)
     }
 
     /**
      * Set the shared instance of the container.
      */
     public static function setInstance(ContainerContract $container): ContainerContract
     {
-        /* @phpstan-ignore-next-line */
-        return ApplicationContext::setContainer($container);
+        return ApplicationContext::setContainer($container); // @phpstan-ignore return.type
     }
 
     public function offsetExists(mixed $offset): bool

src/core/src/Database/Eloquent/Factories/Factory.php

@@ -96,14 +96,14 @@ abstract class Factory
     /**
      * The default model name resolver.
      *
-     * @var callable(self): class-string<TModel>
+     * @var null|(callable(self): class-string<TModel>)
      */
     protected static $modelNameResolver;
 
     /**
      * The factory name resolver.
      *
-     * @var callable(class-string<Model>): class-string<Factory>
+     * @var null|(callable(class-string<Model>): class-string<Factory>)
      */
     protected static $factoryNameResolver;
 

src/core/src/Database/Eloquent/Model.php

@@ -127,7 +127,7 @@ protected function guessBelongsToRelation()
     {
         [$one, $two, $three, $caller] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 4);
 
-        return $caller['function'] ?? $three['function'];
+        return $caller['function'] ?? $three['function']; // @phpstan-ignore nullCoalesce.offset (defensive backtrace handling)
     }
 
     /**

src/devtool/src/Generator/ObserverCommand.php

@@ -31,7 +31,7 @@ protected function replaceClass(string $stub, string $name): string
         if (! $model = trim($this->input->getOption('model') ?? '')) {
             $modelParts = explode('\\', $name);
             $model = end($modelParts);
-            $model = Str::ucfirst(Str::before($model, 'Observer')) ?? 'Dummy';
+            $model = Str::ucfirst(Str::before($model, 'Observer'));
         }
 
         $modelNamespace = $this->getConfig()['model_namespace'] ?? 'App\Models';

src/devtool/src/Generator/PolicyCommand.php

@@ -34,7 +34,7 @@ protected function replaceClass(string $stub, string $name): string
         if (! $model = trim($this->input->getOption('model') ?? '')) {
             $modelParts = explode('\\', $name);
             $model = end($modelParts);
-            $model = Str::ucfirst(Str::before($model, 'Policy')) ?? 'Dummy';
+            $model = Str::ucfirst(Str::before($model, 'Policy'));
         }
 
         $modelNamespace = $this->getConfig()['model_namespace'] ?? 'App\Models';

src/encryption/src/Encrypter.php

@@ -202,10 +202,6 @@ protected function hash(string $iv, mixed $value, string $key): string
      */
     protected function getJsonPayload(string $payload): array
     {
-        if (! is_string($payload)) {
-            throw new DecryptException('The payload is invalid.');
-        }
-
         $payload = json_decode(base64_decode($payload), true);
 
         // If the payload is not valid JSON or does not have the proper keys set we will

src/event/illuminate/CallQueuedListener.php

@@ -114,7 +114,7 @@ public function failed(Throwable $e): void
      */
     protected function prepareData(): void
     {
-        if (is_string($this->data)) {
+        if (is_string($this->data)) { // @phpstan-ignore function.impossibleType (defensive: deserialization can bypass type checks)
             $this->data = unserialize($this->data);
         }
     }