Merge pull request #7525 from kenjis/refactor-IncomingRequest-getLocale

refactor: remove unneeded code in IncomingRequest
codeigniter4 · May 30, 2023 · 167042a · 167042a
2 parents a724f92 + a4de3e7
commit 167042a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
@@ -120,11 +120,6 @@ parameters:
 			count: 1
 			path: system/HTTP/Files/UploadedFile.php
 
-		-
-			message: "#^Property CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:\\$locale \\(string\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: system/HTTP/IncomingRequest.php
-
 		-
 			message: "#^Property CodeIgniter\\\\HTTP\\\\Message\\:\\:\\$protocolVersion \\(string\\) on left side of \\?\\? is not nullable\\.$#"
 			count: 1

diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
@@ -554,7 +554,7 @@ public function setLocale(string $locale)
      */
     public function getLocale(): string
     {
-        return $this->locale ?? $this->defaultLocale;
+        return $this->locale;
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -554,7 +554,7 @@ public function setLocale(string $locale) @@
          */
         public function getLocale(): string
         {
-            return $this->locale ?? $this->defaultLocale;
+            return $this->locale;
         }
         /**
@@ Expand Down @@