Skip to content

Commit af28c29

Browse files
Merge branch '7.0' into 7.1
* 7.0: List CS fix in .git-blame-ignore-revs Fix implicitly-required parameters minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench) Fix bad merge List CS fix in .git-blame-ignore-revs Fix implicitly-required parameters List CS fix in .git-blame-ignore-revs Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value [Messenger][AmazonSqs] Allow async-aws/sqs version 2
2 parents 81a9628 + 43810bd commit af28c29

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

TranslatableInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
*/
1717
interface TranslatableInterface
1818
{
19-
public function trans(TranslatorInterface $translator, string $locale = null): string;
19+
public function trans(TranslatorInterface $translator, ?string $locale = null): string;
2020
}

TranslatorInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ interface TranslatorInterface
5959
*
6060
* @throws \InvalidArgumentException If the locale contains invalid characters
6161
*/
62-
public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null): string;
62+
public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string;
6363

6464
/**
6565
* Returns the default locale.

TranslatorTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function getLocale(): string
3535
return $this->locale ?: (class_exists(\Locale::class) ? \Locale::getDefault() : 'en');
3636
}
3737

38-
public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null): string
38+
public function trans(?string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string
3939
{
4040
if (null === $id || '' === $id) {
4141
return '';

0 commit comments

Comments
 (0)