Issue/587 Fix the Rector findings and run rector:check in CI

.github/workflows/php.yml

@@ -60,6 +60,9 @@ jobs:
       - name: Run PHPStan
         run: composer phpstan
 
+      - name: Run Rector
+        run: composer rector:check
+
       - name: Run tests
         run: composer test -- --fail-on-warning --fail-on-risky
 

CHANGELOG.md

@@ -48,6 +48,7 @@ The format is based on Keep a Changelog.
 - Refactored the Lang package to resolve adapter instances through `LangFactory` configuration and load file translations lazily on first use instead of preloading them during web boot (#533)
 - **BREAKING:** Reshaped Lang configuration so `lang.default` now selects the adapter, locale fallback moved to `lang.default_locale`, and the unused `lang.enabled` toggle was removed (#533)
 - **BREAKING:** Removed `Lang::isEnabled()` from the public Lang API because it no longer affected runtime behavior (#533)
+- Applied the pending Rector refactors across `src/` (null-coalescing assignment for lazy initialization, explicit `instanceof` checks instead of truthiness checks on nullable objects, native return types on `env()`, `CurlAdapter::getId()` and `CurlAdapter::getResponseCookies()`) and added `composer rector:check` to the CI workflow after PHPStan (#587)
 
 ### Fixed
 - The page not found response is JSON for every client that asks for JSON, not only when the `Accept` header is exactly `application/json`: clients such as axios (`application/json, text/plain, */*`), a `charset` parameter, `+json` types and AJAX requests used to get the HTML page. `page_not_found_response()` decides with `Request::expectsJson()` and takes an optional request (#581)

src/App/Factories/AppFactory.php

@@ -44,11 +44,7 @@ class AppFactory
     public static function create(string $type, string $baseDir): App
     {
 
-        if (!isset(self::$instances[$type])) {
-            self::$instances[$type] = self::createInstance($type, $baseDir);
-        }
-
-        return self::$instances[$type];
+        return self::$instances[$type] ??= self::createInstance($type, $baseDir);
     }
 
     public static function destroy(string $type): void

src/Archive/Adapters/ZipAdapter.php

@@ -209,9 +209,7 @@ private function openArchive(): void
             throw ArchiveException::missingArchiveName();
         }
 
-        if ($this->archive === null) {
-            $this->archive = new ZipArchive();
-        }
+        $this->archive ??= new ZipArchive();
 
         if ($this->archive->filename) {
             $this->archive->close();

src/Archive/Factories/ArchiveFactory.php

@@ -52,11 +52,7 @@ public static function get(string $type = ArchiveType::PHAR): Archive
      */
     public function resolve(string $type = ArchiveType::PHAR): Archive
     {
-        if (!isset($this->instances[$type])) {
-            $this->instances[$type] = $this->createInstance($type);
-        }
-
-        return $this->instances[$type];
+        return $this->instances[$type] ??= $this->createInstance($type);
     }
 
     /**

src/Asset/AssetManager.php

@@ -92,7 +92,7 @@ public function register(array $assets): void
      */
     public function registerAsset(Asset $asset): void
     {
-        if ($asset->getName() && $this->get($asset->getName())) {
+        if ($asset->getName() && $this->get($asset->getName()) instanceof Asset) {
             throw AssetException::nameInUse($asset->getName());
         }
 

src/Auth/Factories/AuthFactory.php

@@ -75,11 +75,7 @@ public function resolve(?string $adapter = null): Auth
 
         $adapterClass = $this->getAdapterClass($adapter);
 
-        if (!isset($this->instances[$adapter])) {
-            $this->instances[$adapter] = $this->createInstance($adapterClass, $adapter);
-        }
-
-        return $this->instances[$adapter];
+        return $this->instances[$adapter] ??= $this->createInstance($adapterClass, $adapter);
     }
 
     /**

src/Cache/Factories/CacheFactory.php

@@ -68,11 +68,7 @@ public function resolve(?string $adapter = null): Cache
 
         $adapterClass = $this->getAdapterClass($adapter);
 
-        if (!isset($this->instances[$adapter])) {
-            $this->instances[$adapter] = $this->createInstance($adapterClass, $adapter);
-        }
-
-        return $this->instances[$adapter];
+        return $this->instances[$adapter] ??= $this->createInstance($adapterClass, $adapter);
     }
 
     /**

src/Captcha/Factories/CaptchaFactory.php

@@ -68,11 +68,7 @@ public function resolve(?string $adapter = null): Captcha
 
         $adapterClass = $this->getAdapterClass($adapter);
 
-        if (!isset($this->instances[$adapter])) {
-            $this->instances[$adapter] = $this->createInstance($adapterClass, $adapter);
-        }
-
-        return $this->instances[$adapter];
+        return $this->instances[$adapter] ??= $this->createInstance($adapterClass, $adapter);
     }
 
     /**

src/Config/Config.php

@@ -77,7 +77,7 @@ public function importIfExists(Setup $setup): bool
      */
     public function get(string $key, $default = null)
     {
-        if ($this->configs && $this->configs->has($key)) {
+        if ($this->configs instanceof Data && $this->configs->has($key)) {
             return $this->configs->get($key);
         }
 
@@ -97,7 +97,7 @@ public function all(): ?Data
      */
     public function has(string $key): bool
     {
-        return $this->configs && !empty($this->configs->has($key));
+        return $this->configs instanceof Data && !empty($this->configs->has($key));
     }
 
     /**
@@ -117,7 +117,7 @@ public function set(string $key, $value): void
      */
     public function delete(string $key): void
     {
-        $this->configs && $this->configs->remove($key);
+        $this->configs instanceof Data && $this->configs->remove($key);
     }
 
     /**

src/Database/Adapters/Sleekdb/SleekDbal.php

@@ -367,9 +367,7 @@ protected function buildJoinPath(string $currentPath, string $table): string
      */
     protected function getQueryBuilder(): QueryBuilder
     {
-        if ($this->queryBuilder === null) {
-            $this->queryBuilder = $this->getOrmModel()->createQueryBuilder();
-        }
+        $this->queryBuilder ??= $this->getOrmModel()->createQueryBuilder();
 
         return $this->queryBuilder;
     }

src/Debugger/DebuggerStore.php

@@ -29,9 +29,7 @@ class DebuggerStore implements DebuggerStoreInterface
     public function init(array $keys): void
     {
         foreach ($keys as $key) {
-            if (!isset(self::$store[$key])) {
-                self::$store[$key] = [];
-            }
+            self::$store[$key] ??= [];
         }
     }
 

src/Di/DiContainer.php

@@ -193,9 +193,7 @@ private function resolve(string $abstract, array $args = [], bool $singleton = t
             $concrete = $this->registry->getConcrete($abstract);
 
             if ($singleton) {
-                if (!isset($this->container[$abstract])) {
-                    $this->container[$abstract] = $this->instantiate($concrete, $args);
-                }
+                $this->container[$abstract] ??= $this->instantiate($concrete, $args);
                 return $this->container[$abstract];
             }
 

src/Encryption/Factories/CryptorFactory.php

@@ -52,11 +52,7 @@ public static function get(string $type = CryptorType::SYMMETRIC): Cryptor
      */
     public function resolve(string $type = CryptorType::SYMMETRIC): Cryptor
     {
-        if (!isset($this->instances[$type])) {
-            $this->instances[$type] = $this->createInstance($type);
-        }
-
-        return $this->instances[$type];
+        return $this->instances[$type] ??= $this->createInstance($type);
     }
 
     /**

src/Environment/Helpers/env.php

@@ -31,7 +31,7 @@ function environment(): Environment
  * @return mixed
  * @throws EnvException|DiException|\ReflectionException
  */
-function env(string $var, $default = null)
+function env(string $var, $default = null): mixed
 {
     return environment()->getValue($var, $default);
 }

src/HttpClient/Adapters/CurlAdapter.php

@@ -260,9 +260,9 @@ public function finalizeResponse($rawResponse): void
     }
 
     /**
-     * @return int|string
+     * @return int
      */
-    public function getId()
+    public function getId(): int
     {
         return $this->id;
     }
@@ -291,9 +291,9 @@ public function getResponseHeaders(): iterable
     }
 
     /**
-     * @return mixed
+     * @return array<string, mixed>
      */
-    public function getResponseCookies()
+    public function getResponseCookies(): array
     {
         return $this->responseCookies;
     }

src/Lang/Adapters/FileAdapter.php

@@ -91,7 +91,7 @@ public function get(string $key, array|string $params = null): string
             $this->loadTranslations();
         }
 
-        if ($this->translations && $this->translations->has($key)) {
+        if ($this->translations instanceof Data && $this->translations->has($key)) {
             $message = $this->translations->get($key);
             return $params ? _message($message, $params) : $message;
         }

src/Logger/Factories/LoggerFactory.php

@@ -77,11 +77,7 @@ public function resolve(?string $adapter = null): Logger
 
         LoggerConfig::setAppLogLevel($logLevel);
 
-        if (!isset($this->instances[$adapter])) {
-            $this->instances[$adapter] = $this->createInstance($adapterClass, $adapter);
-        }
-
-        return $this->instances[$adapter];
+        return $this->instances[$adapter] ??= $this->createInstance($adapterClass, $adapter);
     }
 
     /**

src/Mailer/Factories/MailerFactory.php

@@ -72,11 +72,7 @@ public function resolve(?string $adapter = null): Mailer
 
         $adapterClass = $this->getAdapterClass($adapter);
 
-        if (!isset($this->instances[$adapter])) {
-            $this->instances[$adapter] = $this->createInstance($adapterClass, $adapter);
-        }
-
-        return $this->instances[$adapter];
+        return $this->instances[$adapter] ??= $this->createInstance($adapterClass, $adapter);
     }
 
     /**

src/RateLimit/Factories/RateLimiterFactory.php

@@ -63,11 +63,7 @@ public function resolve(?string $adapter = null): RateLimiter
         $adapter ??= (string) config()->get('rate_limit.default', RateLimitType::FILE);
         $adapterClass = $this->getAdapterClass($adapter);
 
-        if (!isset($this->instances[$adapter])) {
-            $this->instances[$adapter] = $this->createInstance($adapterClass, $adapter);
-        }
-
-        return $this->instances[$adapter];
+        return $this->instances[$adapter] ??= $this->createInstance($adapterClass, $adapter);
     }
 
     /**

src/Renderer/Factories/RendererFactory.php

@@ -64,11 +64,7 @@ public function resolve(?string $adapter = null): Renderer
 
         $adapterClass = $this->getAdapterClass($adapter);
 
-        if (!isset($this->instances[$adapter])) {
-            $this->instances[$adapter] = $this->createInstance($adapterClass, $adapter);
-        }
-
-        return $this->instances[$adapter];
+        return $this->instances[$adapter] ??= $this->createInstance($adapterClass, $adapter);
     }
 
     /**

src/Session/Factories/SessionFactory.php

@@ -64,11 +64,7 @@ public function resolve(?string $adapter = null): Session
 
         $adapterClass = $this->getAdapterClass($adapter);
 
-        if (!isset($this->instances[$adapter])) {
-            $this->instances[$adapter] = $this->createInstance($adapterClass, $adapter);
-        }
-
-        return $this->instances[$adapter];
+        return $this->instances[$adapter] ??= $this->createInstance($adapterClass, $adapter);
     }
 
     /**

src/Storage/Factories/FileSystemFactory.php

@@ -78,11 +78,7 @@ public function resolve(?string $adapter = null): FileSystem
 
         $adapterClass = $this->getAdapterClass($adapter);
 
-        if (!isset($this->instances[$adapter])) {
-            $this->instances[$adapter] = $this->createInstance($adapterClass, $adapter);
-        }
-
-        return $this->instances[$adapter];
+        return $this->instances[$adapter] ??= $this->createInstance($adapterClass, $adapter);
     }
 
     /**

src/Validation/Validator.php

@@ -217,9 +217,7 @@ public function getErrors(): array
      */
     protected function addError(string $field, string $rule, mixed $param = null): void
     {
-        if (!isset($this->errors[$field])) {
-            $this->errors[$field] = [];
-        }
+        $this->errors[$field] ??= [];
 
         $this->errors[$field][$rule] = $param;
     }
@@ -249,9 +247,7 @@ protected function executeCustomRule(string $rule, mixed $value, ...$params): bo
 
     private function setOrUpdateRule(string $field, string $ruleName, mixed $ruleParam): void
     {
-        if (!isset($this->rules[$field])) {
-            $this->rules[$field] = [];
-        }
+        $this->rules[$field] ??= [];
 
         $this->rules[$field][$ruleName] = $ruleParam;
     }