Skip to content

Commit aa94bfe

Browse files
Merge branch '5.4' into 6.2
* 5.4: [Translation][Mailer] Convert `$this` calls to static ones in data providers [BC Break] Make data providers for abstract test cases static use TestCase suffix for abstract tests in Tests directories Fix Request locale property doc types Bump absolute lowest dep to 4.4
2 parents d5180d1 + 16017a2 commit aa94bfe

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Request.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ class Request
189189
protected $session;
190190

191191
/**
192-
* @var string
192+
* @var string|null
193193
*/
194194
protected $locale;
195195

@@ -1367,7 +1367,7 @@ public function setLocale(string $locale)
13671367
*/
13681368
public function getLocale(): string
13691369
{
1370-
return null === $this->locale ? $this->defaultLocale : $this->locale;
1370+
return $this->locale ?? $this->defaultLocale;
13711371
}
13721372

13731373
/**

0 commit comments

Comments
 (0)