Skip to content

Commit 295995d

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.4' into 7.0
* 6.4: 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 5fbee19 + 2628ded commit 295995d

12 files changed

+28
-28
lines changed

‎Countries.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public static function numericCodeExists(string $numericCode): bool
127127
*
128128
* @throws MissingResourceException if the country code does not exist
129129
*/
130-
public static function getName(string $country, string $displayLocale = null): string
130+
public static function getName(string $country, ?string $displayLocale = null): string
131131
{
132132
return self::readEntry(['Names', $country], $displayLocale);
133133
}
@@ -137,7 +137,7 @@ public static function getName(string $country, string $displayLocale = null): s
137137
*
138138
* @throws MissingResourceException if the country code does not exist
139139
*/
140-
public static function getAlpha3Name(string $alpha3Code, string $displayLocale = null): string
140+
public static function getAlpha3Name(string $alpha3Code, ?string $displayLocale = null): string
141141
{
142142
return self::getName(self::getAlpha2Code($alpha3Code), $displayLocale);
143143
}
@@ -147,7 +147,7 @@ public static function getAlpha3Name(string $alpha3Code, string $displayLocale =
147147
*
148148
* @return array<string, string>
149149
*/
150-
public static function getNames(string $displayLocale = null): array
150+
public static function getNames(?string $displayLocale = null): array
151151
{
152152
return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale);
153153
}
@@ -159,7 +159,7 @@ public static function getNames(string $displayLocale = null): array
159159
*
160160
* @return array<string, string>
161161
*/
162-
public static function getAlpha3Names(string $displayLocale = null): array
162+
public static function getAlpha3Names(?string $displayLocale = null): array
163163
{
164164
$alpha2Names = self::getNames($displayLocale);
165165
$alpha3Names = [];

‎Currencies.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ public static function exists(string $currency): bool
5050
/**
5151
* @throws MissingResourceException if the currency code does not exist
5252
*/
53-
public static function getName(string $currency, string $displayLocale = null): string
53+
public static function getName(string $currency, ?string $displayLocale = null): string
5454
{
5555
return self::readEntry(['Names', $currency, self::INDEX_NAME], $displayLocale);
5656
}
5757

5858
/**
5959
* @return string[]
6060
*/
61-
public static function getNames(string $displayLocale = null): array
61+
public static function getNames(?string $displayLocale = null): array
6262
{
6363
// ====================================================================
6464
// For reference: It is NOT possible to return names indexed by
@@ -82,7 +82,7 @@ public static function getNames(string $displayLocale = null): array
8282
/**
8383
* @throws MissingResourceException if the currency code does not exist
8484
*/
85-
public static function getSymbol(string $currency, string $displayLocale = null): string
85+
public static function getSymbol(string $currency, ?string $displayLocale = null): string
8686
{
8787
return self::readEntry(['Names', $currency, self::INDEX_SYMBOL], $displayLocale);
8888
}

‎Data/Generator/TimezoneDataGenerator.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ private function generateZones(BundleEntryReaderInterface $reader, string $tempD
159159

160160
$regionFormat = $reader->readEntry($tempDir, $locale, ['zoneStrings', 'regionFormat']);
161161
$fallbackFormat = $reader->readEntry($tempDir, $locale, ['zoneStrings', 'fallbackFormat']);
162-
$resolveName = function (string $id, string $city = null) use ($reader, $tempDir, $locale, $regionFormat, $fallbackFormat): ?string {
162+
$resolveName = function (string $id, ?string $city = null) use ($reader, $tempDir, $locale, $regionFormat, $fallbackFormat): ?string {
163163
// Resolve default name as described per http://cldr.unicode.org/translation/timezones
164164
if (isset($this->zoneToCountryMapping[$id])) {
165165
try {

‎Languages.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public static function exists(string $language): bool
5656
*
5757
* @throws MissingResourceException if the language code does not exist
5858
*/
59-
public static function getName(string $language, string $displayLocale = null): string
59+
public static function getName(string $language, ?string $displayLocale = null): string
6060
{
6161
try {
6262
return self::readEntry(['Names', $language], $displayLocale);
@@ -78,7 +78,7 @@ public static function getName(string $language, string $displayLocale = null):
7878
*
7979
* @return array<string, string>
8080
*/
81-
public static function getNames(string $displayLocale = null): array
81+
public static function getNames(?string $displayLocale = null): array
8282
{
8383
return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale);
8484
}
@@ -137,7 +137,7 @@ public static function alpha3CodeExists(string $language): bool
137137
*
138138
* @throws MissingResourceException if the country code does not exists
139139
*/
140-
public static function getAlpha3Name(string $language, string $displayLocale = null): string
140+
public static function getAlpha3Name(string $language, ?string $displayLocale = null): string
141141
{
142142
try {
143143
return self::getName(self::getAlpha2Code($language), $displayLocale);
@@ -157,7 +157,7 @@ public static function getAlpha3Name(string $language, string $displayLocale = n
157157
*
158158
* @return array<string, string>
159159
*/
160-
public static function getAlpha3Names(string $displayLocale = null): array
160+
public static function getAlpha3Names(?string $displayLocale = null): array
161161
{
162162
$alpha2Names = self::getNames($displayLocale);
163163
$alpha3Names = [];

‎Locales.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static function exists(string $locale): bool
5151
/**
5252
* @throws MissingResourceException if the locale does not exist
5353
*/
54-
public static function getName(string $locale, string $displayLocale = null): string
54+
public static function getName(string $locale, ?string $displayLocale = null): string
5555
{
5656
try {
5757
return self::readEntry(['Names', $locale], $displayLocale);
@@ -67,7 +67,7 @@ public static function getName(string $locale, string $displayLocale = null): st
6767
/**
6868
* @return string[]
6969
*/
70-
public static function getNames(string $displayLocale = null): array
70+
public static function getNames(?string $displayLocale = null): array
7171
{
7272
return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale);
7373
}

‎ResourceBundle.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ abstract protected static function getPath(): string;
4343
* @return mixed returns an array or {@link \ArrayAccess} instance for
4444
* complex data and a scalar value for simple data
4545
*/
46-
final protected static function readEntry(array $indices, string $locale = null, bool $fallback = true): mixed
46+
final protected static function readEntry(array $indices, ?string $locale = null, bool $fallback = true): mixed
4747
{
4848
if (!isset(self::$entryReader)) {
4949
self::$entryReader = new BundleEntryReader(new BufferedBundleReader(
@@ -58,7 +58,7 @@ final protected static function readEntry(array $indices, string $locale = null,
5858
return self::$entryReader->readEntry(static::getPath(), $locale ?? \Locale::getDefault(), $indices, $fallback);
5959
}
6060

61-
final protected static function asort(iterable $list, string $locale = null): array
61+
final protected static function asort(iterable $list, ?string $locale = null): array
6262
{
6363
if ($list instanceof \Traversable) {
6464
$list = iterator_to_array($list);

‎Scripts.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ public static function exists(string $script): bool
4343
/**
4444
* @throws MissingResourceException if the script code does not exist
4545
*/
46-
public static function getName(string $script, string $displayLocale = null): string
46+
public static function getName(string $script, ?string $displayLocale = null): string
4747
{
4848
return self::readEntry(['Names', $script], $displayLocale);
4949
}
5050

5151
/**
5252
* @return string[]
5353
*/
54-
public static function getNames(string $displayLocale = null): array
54+
public static function getNames(?string $displayLocale = null): array
5555
{
5656
return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale);
5757
}

‎Timezones.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ public static function exists(string $timezone): bool
4949
/**
5050
* @throws MissingResourceException if the timezone identifier does not exist or is an alias
5151
*/
52-
public static function getName(string $timezone, string $displayLocale = null): string
52+
public static function getName(string $timezone, ?string $displayLocale = null): string
5353
{
5454
return self::readEntry(['Names', $timezone], $displayLocale);
5555
}
5656

5757
/**
5858
* @return string[]
5959
*/
60-
public static function getNames(string $displayLocale = null): array
60+
public static function getNames(?string $displayLocale = null): array
6161
{
6262
return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale);
6363
}
@@ -66,14 +66,14 @@ public static function getNames(string $displayLocale = null): array
6666
* @throws \Exception if the timezone identifier does not exist
6767
* @throws RuntimeException if there's no timezone DST transition information available
6868
*/
69-
public static function getRawOffset(string $timezone, int $timestamp = null): int
69+
public static function getRawOffset(string $timezone, ?int $timestamp = null): int
7070
{
7171
$dateTimeImmutable = new \DateTimeImmutable(date('Y-m-d H:i:s', $timestamp ?? time()), new \DateTimeZone($timezone));
7272

7373
return $dateTimeImmutable->getOffset();
7474
}
7575

76-
public static function getGmtOffset(string $timezone, int $timestamp = null, string $displayLocale = null): string
76+
public static function getGmtOffset(string $timezone, ?int $timestamp = null, ?string $displayLocale = null): string
7777
{
7878
$offset = self::getRawOffset($timezone, $timestamp);
7979
$abs = abs($offset);

‎Util/GitRepository.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function getLastAuthoredDate(): \DateTimeImmutable
6969
return new \DateTimeImmutable($this->getLastLine($this->execInPath('git log -1 --format="%ai"')));
7070
}
7171

72-
public function getLastTag(callable $filter = null): string
72+
public function getLastTag(?callable $filter = null): string
7373
{
7474
$tags = $this->execInPath('git tag -l --sort=v:refname');
7575

@@ -90,7 +90,7 @@ private function execInPath(string $command): array
9090
return self::exec(sprintf('cd %s && %s', escapeshellarg($this->path), $command));
9191
}
9292

93-
private static function exec(string $command, string $customErrorMessage = null): array
93+
private static function exec(string $command, ?string $customErrorMessage = null): array
9494
{
9595
exec(sprintf('%s 2>&1', $command), $output, $result);
9696

‎Util/IcuVersion.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class IcuVersion
4848
*
4949
* @see normalize()
5050
*/
51-
public static function compare(string $version1, string $version2, string $operator, int $precision = null): bool
51+
public static function compare(string $version1, string $version2, string $operator, ?int $precision = null): bool
5252
{
5353
$version1 = self::normalize($version1, $precision);
5454
$version2 = self::normalize($version2, $precision);

‎Util/IntlTestHelper.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class IntlTestHelper
3030
/**
3131
* Should be called before tests that work fine with the stub implementation.
3232
*/
33-
public static function requireIntl(TestCase $testCase, string $minimumIcuVersion = null): void
33+
public static function requireIntl(TestCase $testCase, ?string $minimumIcuVersion = null): void
3434
{
3535
$minimumIcuVersion ??= Intl::getIcuStubVersion();
3636

@@ -62,7 +62,7 @@ public static function requireIntl(TestCase $testCase, string $minimumIcuVersion
6262
* Should be called before tests that require a feature-complete intl
6363
* implementation.
6464
*/
65-
public static function requireFullIntl(TestCase $testCase, string $minimumIcuVersion = null): void
65+
public static function requireFullIntl(TestCase $testCase, ?string $minimumIcuVersion = null): void
6666
{
6767
// We only run tests if the intl extension is loaded...
6868
if (!Intl::isExtensionLoaded()) {

‎Util/Version.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Version
3838
*
3939
* @see normalize()
4040
*/
41-
public static function compare(string $version1, string $version2, string $operator, int $precision = null): bool
41+
public static function compare(string $version1, string $version2, string $operator, ?int $precision = null): bool
4242
{
4343
$version1 = self::normalize($version1, $precision);
4444
$version2 = self::normalize($version2, $precision);

0 commit comments

Comments
 (0)