refactor: fix rector change on RedirectException (#9433)

codeigniter4 · Jan 24, 2025 · b5e9715 · b5e9715
1 parent b18a406
commit b5e9715
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         "phpunit/phpcov": "^9.0.2 || ^10.0",
         "phpunit/phpunit": "^10.5.16 || ^11.2",
         "predis/predis": "^1.1 || ^2.3",
-        "rector/rector": "2.0.6",
+        "rector/rector": "2.0.7",
         "shipmonk/phpstan-baseline-per-identifier": "^2.0"
     },
     "replace": {

diff --git a/system/HTTP/Exceptions/RedirectException.php b/system/HTTP/Exceptions/RedirectException.php
@@ -51,7 +51,8 @@ public function __construct($message = '', int $code = 0, ?Throwable $previous =
 
         if ($message instanceof ResponseInterface) {
             $this->response = $message;
-            $message        = '';
+
+            $message = '';
 
             if ($this->response->getHeaderLine('Location') === '' && $this->response->getHeaderLine('Refresh') === '') {
                 throw new LogicException(
@@ -70,14 +71,19 @@ public function __construct($message = '', int $code = 0, ?Throwable $previous =
     public function getResponse(): ResponseInterface
     {
         if (! $this->response instanceof ResponseInterface) {
-            $this->response = service('response')
-                ->redirect(base_url($this->getMessage()), 'auto', $this->getCode());
+            $this->response = service('response')->redirect(
+                base_url($this->getMessage()),
+                'auto',
+                $this->getCode(),
+            );
         }
 
-        service('logger')->info(
-            'REDIRECTED ROUTE at '
-             . ($this->response->getHeaderLine('Location') ?: substr($this->response->getHeaderLine('Refresh'), 6)),
-        );
+        $location = $this->response->getHeaderLine('Location');
+
+        service(('logger'))->info(sprintf(
+            'REDIRECTED ROUTE at %s',
+            $location !== '' ? $location : substr($this->response->getHeaderLine('Refresh'), 6),
+        ));
 
         return $this->response;
     }

diff --git a/utils/phpstan-baseline/ternary.shortNotAllowed.neon b/utils/phpstan-baseline/ternary.shortNotAllowed.neon
@@ -1,4 +1,4 @@
-# total 38 errors
+# total 37 errors
 
 parameters:
     ignoreErrors:
@@ -47,11 +47,6 @@ parameters:
             count: 1
             path: ../../system/HTTP/CURLRequest.php
 
-        -
-            message: '#^Short ternary operator is not allowed\. Use null coalesce operator if applicable or consider using long ternary\.$#'
-            count: 1
-            path: ../../system/HTTP/Exceptions/RedirectException.php
-
         -
             message: '#^Short ternary operator is not allowed\. Use null coalesce operator if applicable or consider using long ternary\.$#'
             count: 2