441 upgrade php stan analysis from level 6 to level 7

.gitignore

@@ -16,6 +16,7 @@ Thumbs.db
 # Test & Runtime artifacts
 # =========================
 /tests/_root/shared/store/*
+/tests/_root/cron-tests/
 /coverage/
 *.log
 

phpstan.neon.dist

@@ -1,6 +1,6 @@
 parameters:
     phpVersion: 70400
-    level: 6
+    level: 7
 
     paths:
         - src

src/App/Adapters/ConsoleAppAdapter.php

@@ -44,7 +44,7 @@ class ConsoleAppAdapter extends AppAdapter
 
     protected ConsoleOutput $output;
 
-    protected ?Application $application = null;
+    protected Application $application;
 
     public function __construct()
     {
@@ -59,6 +59,11 @@ public function __construct()
             $this->loadEnvironment();
             $this->loadAppConfig();
         }
+
+        $this->application = $this->createApplication(
+            config()->get('app.name', 'UNKNOWN'),
+            config()->get('app.version', 'UNKNOWN')
+        );
     }
 
     /**
@@ -72,11 +77,6 @@ public function __construct()
     public function start(): ?int
     {
         try {
-            $this->application = $this->createApplication(
-                config()->get('app.name', 'UNKNOWN'),
-                config()->get('app.version', 'UNKNOWN')
-            );
-
             $this->loadLanguage();
 
             $this->registerCoreCommands();

src/App/Adapters/WebAppAdapter.php

@@ -146,7 +146,7 @@ public function start(): ?int
 
             $viewCache = $this->setupViewCache();
 
-            if ($viewCache->serveCachedView(route_uri(), $this->response)) {
+            if ($viewCache->serveCachedView(route_uri() ?? '', $this->response)) {
                 stop();
             }
 

src/App/App.php

@@ -19,6 +19,7 @@
 use Quantum\App\Exceptions\BaseException;
 use Quantum\App\Exceptions\AppException;
 use Quantum\App\Contracts\AppInterface;
+use RuntimeException;
 
 /**
  * Class App
@@ -42,6 +43,10 @@ public static function setBaseDir(string $baseDir): void
 
     public static function getBaseDir(): string
     {
+        if (self::$baseDir === null || self::$baseDir === '') {
+            throw new RuntimeException('Base directory is not initialized.');
+        }
+
         return self::$baseDir;
     }
 

src/App/Exceptions/StopExecutionException.php

@@ -28,7 +28,7 @@ public static function executionTerminated(?int $code): self
     {
         return new self(
             ExceptionMessages::EXECUTION_TERMINATED,
-            $code
+            $code ?? 0
         );
     }
 }

src/App/Helpers/misc.php

@@ -24,9 +24,9 @@ function _message(string $subject, $params): string
     if (is_array($params)) {
         return preg_replace_callback('/{%\d+}/', function () use (&$params) {
             return array_shift($params);
-        }, $subject);
+        }, $subject) ?? $subject;
     } else {
-        return preg_replace('/{%\d+}/', $params, $subject);
+        return preg_replace('/{%\d+}/', $params, $subject) ?? $subject;
     }
 }
 
@@ -62,8 +62,8 @@ function random_number(int $length = 10): int
 function slugify(string $text): string
 {
     $text = trim($text, ' ');
-    $text = preg_replace('/[^\p{L}\p{N}]/u', ' ', $text);
-    $text = preg_replace('/\s+/', '-', $text);
+    $text = preg_replace('/[^\p{L}\p{N}]/u', ' ', $text) ?? $text;
+    $text = preg_replace('/\s+/', '-', $text) ?? $text;
     $text = trim($text, '-');
     $text = mb_strtolower($text);
 

src/App/Traits/AppTrait.php

@@ -76,7 +76,9 @@ protected function loadComponentHelperFunctions(): void
 
         $srcDir = dirname(__DIR__, 2);
 
-        foreach (glob($srcDir . DS . '*', GLOB_ONLYDIR) as $componentDir) {
+        $componentDirs = glob($srcDir . DS . '*', GLOB_ONLYDIR);
+
+        foreach (is_array($componentDirs) ? $componentDirs : [] as $componentDir) {
             $helperPath = $componentDir . DS . 'Helpers';
             if (is_dir($helperPath)) {
                 $loader->loadDir($helperPath);

src/App/Traits/ConsoleAppTrait.php

@@ -17,6 +17,7 @@
 namespace Quantum\App\Traits;
 
 use Quantum\Environment\Exceptions\EnvException;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Application;
 use Quantum\App\Exceptions\BaseException;
 use Quantum\Di\Exceptions\DiException;
@@ -80,7 +81,10 @@ private function registerCommands(string $directory, string $namespace): void
         $commands = CommandDiscovery::discover($directory, $namespace);
 
         foreach ($commands as $command) {
-            $this->application->add(new $command['class']());
+            $instance = new $command['class']();
+            if ($instance instanceof Command) {
+                $this->application->add($instance);
+            }
         }
     }
 
@@ -91,7 +95,7 @@ private function validateCommand(): void
     {
         $commandName = $this->input->getFirstArgument();
 
-        if (!$this->application->has($commandName)) {
+        if ($commandName === null || !$this->application->has($commandName)) {
             throw new Exception("Command `$commandName` is not defined");
         }
     }

src/Archive/Adapters/PharAdapter.php

@@ -107,7 +107,9 @@ public function addFile(string $filePath, ?string $entryName = null): bool
         }
 
         try {
-            $this->archive->addFile($filePath, $entryName);
+            $entryName !== null
+                ? $this->archive->addFile($filePath, $entryName)
+                : $this->archive->addFile($filePath);
             return true;
         } catch (Exception $e) {
             return false;
@@ -213,6 +215,8 @@ public function deleteMultipleFiles(array $fileNames): bool
 
     /**
      * @throws ArchiveException
+     * @phpstan-assert Phar $this->archive
+     * @phpstan-assert string $this->archiveName
      */
     private function ensureArchiveOpen(): void
     {

src/Archive/Adapters/ZipAdapter.php

@@ -94,7 +94,9 @@ public function addFile(string $filePath, ?string $entryName = null): bool
             throw ArchiveException::fileNotFound($filePath);
         }
 
-        $result = $this->archive->addFile($filePath, $entryName);
+        $result = $entryName !== null
+            ? $this->archive->addFile($filePath, $entryName)
+            : $this->archive->addFile($filePath);
         $this->requiresReopen = true;
 
         return $result;
@@ -195,6 +197,7 @@ public function deleteMultipleFiles(array $fileNames): bool
 
     /**
      * @throws ArchiveException
+     * @phpstan-assert ZipArchive $this->archive
      */
     private function ensureArchiveOpen(): void
     {

src/Asset/Asset.php

@@ -43,7 +43,7 @@ class Asset
      */
     private ?array $attributes;
 
-    private ?int $position;
+    private int $position;
 
     /**
      * Asset templates
@@ -58,7 +58,7 @@ class Asset
      * Asset constructor
      * @param array<string>|null $attributes
      */
-    public function __construct(int $type, string $path, ?string $name = null, ?int $position = -1, ?array $attributes = [])
+    public function __construct(int $type, string $path, ?string $name = null, int $position = -1, ?array $attributes = [])
     {
         $this->type = $type;
         $this->path = $path;
@@ -76,7 +76,7 @@ public function getType(): int
     }
 
     /**
-     * Gets asset path
+     * Gets an asset path
      */
     public function getPath(): string
     {
@@ -94,7 +94,7 @@ public function getName(): ?string
     /**
      * Gets asset position
      */
-    public function getPosition(): ?int
+    public function getPosition(): int
     {
         return $this->position;
     }
@@ -127,7 +127,7 @@ public function tag(): string
     {
         return _message(
             $this->templates[$this->type],
-            [$this->url(), implode(' ', $this->attributes)]
+            [$this->url(), implode(' ', $this->attributes ?? [])]
         ) . PHP_EOL;
     }
 }

src/Asset/AssetManager.php

@@ -169,7 +169,7 @@ private function setPriorityAssets(): void
             $position = $asset->getPosition();
             $type = $asset->getType();
 
-            if ($position != -1) {
+            if ($position !== -1) {
                 if (isset($this->published[$type][$position])) {
                     throw AssetException::positionInUse($position, $asset->getPath());
                 }
@@ -185,7 +185,7 @@ private function setPriorityAssets(): void
     private function setRegularAssets(): void
     {
         foreach ($this->store as $asset) {
-            if ($asset->getPosition() == -1) {
+            if ($asset->getPosition() === -1) {
                 $this->setPosition($asset, 0);
             }
         }

src/Auth/Adapters/JwtAuthAdapter.php

@@ -38,10 +38,12 @@ class JwtAuthAdapter implements AuthenticatableInterface
 {
     use AuthTrait;
 
+    protected JwtToken $jwt;
+
     /**
      * @throws AuthException
      */
-    public function __construct(AuthServiceInterface $authService, Mailer $mailer, Hasher $hasher, ?JwtToken $jwt = null)
+    public function __construct(AuthServiceInterface $authService, Mailer $mailer, Hasher $hasher, JwtToken $jwt)
     {
         $this->authService = $authService;
         $this->mailer = $mailer;
@@ -138,11 +140,12 @@ public function verifyOtp(int $otp, string $otpToken): array
 
     /**
      * Get Updated Tokens
-     * @throws JwtException
      * @return array<string, string>
+     * @throws JwtException
      */
     protected function getUpdatedTokens(User $user): array
     {
+
         return [
             $this->keyFields[AuthKeys::REFRESH_TOKEN] => $this->generateToken(),
             $this->keyFields[AuthKeys::ACCESS_TOKEN] => base64_encode($this->jwt->setData($this->getVisibleFields($user))->compose()),
@@ -151,8 +154,8 @@ protected function getUpdatedTokens(User $user): array
 
     /**
      * Set Updated Tokens
-     * @throws JwtException
      * @return array<string, string>
+     * @throws JwtException
      */
     protected function setUpdatedTokens(User $user): array
     {

src/Auth/Factories/AuthFactory.php

@@ -16,14 +16,15 @@
 
 namespace Quantum\Auth\Factories;
 
+use Quantum\Auth\Contracts\AuthenticatableInterface;
 use Quantum\Auth\Contracts\AuthServiceInterface;
 use Quantum\Service\Exceptions\ServiceException;
 use Quantum\Config\Exceptions\ConfigException;
 use Quantum\Service\Factories\ServiceFactory;
 use Quantum\Auth\Adapters\SessionAuthAdapter;
 use Quantum\Auth\Exceptions\AuthException;
-use Quantum\Auth\Adapters\JwtAuthAdapter;
 use Quantum\App\Exceptions\BaseException;
+use Quantum\Auth\Adapters\JwtAuthAdapter;
 use Quantum\Di\Exceptions\DiException;
 use Quantum\Auth\Enums\AuthType;
 use Quantum\Service\QtService;
@@ -87,12 +88,17 @@ public static function get(?string $adapter = null): Auth
      */
     private static function createInstance(string $adapterClass, string $adapter): Auth
     {
-        return new Auth(new $adapterClass(
-            self::createAuthService($adapter),
-            mailer(),
-            new Hasher(),
-            self::createJwtInstance($adapter)
-        ));
+        $authService = self::createAuthService($adapter);
+
+        $adapterInstance = $adapter === AuthType::JWT
+            ? new $adapterClass($authService, mailer(), new Hasher(), self::createJwtInstance())
+            : new $adapterClass($authService, mailer(), new Hasher());
+
+        if (!$adapterInstance instanceof AuthenticatableInterface) {
+            throw AuthException::adapterNotSupported($adapter);
+        }
+
+        return new Auth($adapterInstance);
     }
 
     /**
@@ -127,8 +133,10 @@ private static function createAuthService(string $adapter): AuthServiceInterface
         return $authService;
     }
 
-    private static function createJwtInstance(string $adapter): ?JwtToken
+    private static function createJwtInstance(): JwtToken
     {
-        return $adapter === AuthType::JWT ? (new JwtToken())->setLeeway(1)->setClaims((array) config()->get('auth.claims')) : null;
+        return (new JwtToken())
+            ->setLeeway(1)
+            ->setClaims((array) config()->get('auth.' . AuthType::JWT . '.claims'));
     }
 }