chore(ci): pin rector 2.7.0 and apply its rewrites

composer.json

@@ -31,7 +31,7 @@
     "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
     "phpcompatibility/phpcompatibility-wp": "*",
     "phpunit/phpunit": "^9.6",
-    "rector/rector": "^2.5",
+    "rector/rector": "2.7.0",
     "captainhook/captainhook": "^5.29",
     "captainhook/hook-installer": "^1.0"
   },

src/Cache/CacheManager.php

@@ -34,9 +34,7 @@ public function store(?string $name = null): Repository
     {
         $name ??= $this->defaultStoreName();
 
-        if (!isset($this->repositories[$name])) {
-            $this->repositories[$name] = new Repository($this->makeStore($name));
-        }
+        $this->repositories[$name] ??= new Repository($this->makeStore($name));
 
         return $this->repositories[$name];
     }

src/Hooks/Hooks.php

@@ -20,9 +20,7 @@ final class Hooks
 
     public function __construct()
     {
-        if (!isset(self::$_hook)) {
-            self::$_hook = new HooksWrapper();
-        }
+        self::$_hook ??= new HooksWrapper();
     }
 
     public function __call(string $method, array $parameters)

src/Http/Detection/ClientIpResolver.php

@@ -73,7 +73,7 @@ private static function isTrustedProxy(string $ip): bool
         return false;
     }
 
-    private static function isIpInRange(string $ip, $range)
+    private static function isIpInRange(string $ip, $range): bool
     {
         $range = trim((string) $range);
         if (!str_contains($range, '/')) {

src/Http/Response.php

@@ -254,9 +254,7 @@ private static function validateHeader($header, $value): array
 
     private static function current(): Response
     {
-        if (\is_null(self::$_current)) {
-            self::$_current = new self();
-        }
+        self::$_current ??= new self();
 
         return self::$_current;
     }

src/Http/Router/AjaxRouter.php

@@ -64,7 +64,7 @@ public function currentRoute()
         return $this->_router->getRegisteredRoute($this->currentRouteName());
     }
 
-    private function isRouteMatched(RouteRegister $route, string|array $requestPath)
+    private function isRouteMatched(RouteRegister $route, string|array $requestPath): bool
     {
         if ($route->getRoutePrefix() . $route->getPath() === $requestPath) {
             return true;

src/Http/Router/RouteBase.php

@@ -185,9 +185,7 @@ public function group(Closure $callback): self
      */
     public function getRouter()
     {
-        if (!isset($this->_router)) {
-            $this->_router = Router::instance();
-        }
+        $this->_router ??= Router::instance();
 
         return $this->_router;
     }

src/Http/Router/Router.php

@@ -77,9 +77,7 @@ public function getRegisteredRoutes(): array
     public static function instance($type = null, $namespace = null, $version = null)
     {
         if ($type === null) {
-            if (\is_null(self::$_instance)) {
-                self::$_instance = new self(RequestType::AJAX, $namespace, $version);
-            }
+            self::$_instance ??= new self(RequestType::AJAX, $namespace, $version);
 
             return self::$_instance;
         }

src/Settings/SettingsRepository.php

@@ -36,8 +36,12 @@ public function get(string $key, $default = null)
         }
 
         $field = $this->schema->field($key);
+        if ($field === null) {
+            return $default;
+        }
 
-        return $field !== null ? $field->default() : $default;
+        // A declared field's own default wins, even when it is null.
+        return $field->default();
     }
 
     /**

src/Shortcode/Shortcode.php

@@ -19,9 +19,7 @@ final class Shortcode
 
     public function __construct()
     {
-        if (!isset(self::$_wrapper)) {
-            self::$_wrapper = new ShortcodeWrapper();
-        }
+        self::$_wrapper ??= new ShortcodeWrapper();
     }
 
     public function __call(string $method, array $parameters)

tests/Settings/SettingsRepositoryTest.php

@@ -36,6 +36,15 @@ public function testSetSaveReload(): void
         $this->assertFalse($fresh->get('logging_enabled'));
     }
 
+    public function testDeclaredNullDefaultWinsOverCallerFallback(): void
+    {
+        $schema = (new SettingsSchema())->add(SettingField::string('label', null));
+        $repo   = new SettingsRepository('demo_settings', $schema);
+
+        $this->assertNull($repo->get('label', 'fallback'));
+        $this->assertSame('fallback', $repo->get('undeclared', 'fallback'));
+    }
+
     public function testUnknownKeyRejected(): void
     {
         $this->expectException(InvalidArgumentException::class);