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

samsonasik · web-flow · commit 167042abaf16 · 2023-05-30T09:57:51.000+07:00
refactor: remove unneeded code in IncomingRequest
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 number	Diff line change
`@@ -554,7 +554,7 @@ public function setLocale(string $locale)`
`554`	`554`	`*/`
`555`	`555`	`public function getLocale(): string`
`556`	`556`	`{`
`557`		`- return $this->locale ?? $this->defaultLocale;`
	`557`	`+ return $this->locale;`
`558`	`558`	`}`
`559`	`559`
`560`	`560`	`/**`