Skip to content

Commit 7299f8c

Browse files
Merge branch '5.0' into 5.1
* 5.0: [VarDumper] fix typo Fix support for PHP8 union types [FrameworkBundle] preserve dots in query-string when redirecting [3.4] Fix support for PHP8 union types [PhpUnitBridge] Streamline ansi/no-ansi of composer according to phpunit --colors option [3.4] Small update in our internal terminology [Cache] fix compat with DBAL v3 [HttpClient] Convert CurlHttpClient::handlePush() to instance method [VarDumper] Fix CliDumper coloration [DI] tighten detection of local dirs to prevent false positives [FrameworkBundle] preserve dots in query-string when redirecting Fix precendence in 4.4 bumped Symfony version to 3.4.43 updated VERSION for 3.4.42 update CONTRIBUTORS for 3.4.42 updated CHANGELOG for 3.4.42
2 parents b21d69e + 72cfa77 commit 7299f8c

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Data/Generator/CurrencyDataGenerator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
class CurrencyDataGenerator extends AbstractDataGenerator
2727
{
28-
private static $blacklist = [
28+
private static $denylist = [
2929
'XBA' => true, // European Composite Unit
3030
'XBB' => true, // European Monetary Unit
3131
'XBC' => true, // European Unit of Account (XBC)
@@ -133,7 +133,7 @@ private function generateSymbolNamePairs(ArrayAccessibleResourceBundle $rootBund
133133
$symbolNamePairs = iterator_to_array($rootBundle['Currencies']);
134134

135135
// Remove unwanted currencies
136-
$symbolNamePairs = array_diff_key($symbolNamePairs, self::$blacklist);
136+
$symbolNamePairs = array_diff_key($symbolNamePairs, self::$denylist);
137137

138138
return $symbolNamePairs;
139139
}

Data/Generator/LanguageDataGenerator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class LanguageDataGenerator extends AbstractDataGenerator
8383
'za' => 'zha',
8484
'zh' => 'zho',
8585
];
86-
private static $blacklist = [
86+
private static $denylist = [
8787
'root' => true, // Absolute root language
8888
'mul' => true, // Multiple languages
8989
'mis' => true, // Uncoded language
@@ -182,7 +182,7 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, strin
182182

183183
private static function generateLanguageNames(ArrayAccessibleResourceBundle $localeBundle): array
184184
{
185-
return array_diff_key(iterator_to_array($localeBundle['Languages']), self::$blacklist);
185+
return array_diff_key(iterator_to_array($localeBundle['Languages']), self::$denylist);
186186
}
187187

188188
private function generateAlpha3Codes(array $languageCodes, ArrayAccessibleResourceBundle $metadataBundle): array

Data/Generator/RegionDataGenerator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class RegionDataGenerator extends AbstractDataGenerator
4040
'YE' => 'YEM',
4141
];
4242

43-
private static $blacklist = [
43+
private static $denylist = [
4444
// Exceptional reservations
4545
'AC' => true, // Ascension Island
4646
'CP' => true, // Clipperton Island
@@ -69,7 +69,7 @@ class RegionDataGenerator extends AbstractDataGenerator
6969

7070
public static function isValidCountryCode($region)
7171
{
72-
if (isset(self::$blacklist[$region])) {
72+
if (isset(self::$denylist[$region])) {
7373
return false;
7474
}
7575

Data/Generator/ScriptDataGenerator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
class ScriptDataGenerator extends AbstractDataGenerator
2626
{
27-
private static $blacklist = [
27+
private static $denylist = [
2828
'Zzzz' => true, // Unknown Script
2929
];
3030

@@ -69,7 +69,7 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
6969
// isset() on \ResourceBundle returns true even if the value is null
7070
if (isset($localeBundle['Scripts']) && null !== $localeBundle['Scripts']) {
7171
$data = [
72-
'Names' => array_diff_key(iterator_to_array($localeBundle['Scripts']), self::$blacklist),
72+
'Names' => array_diff_key(iterator_to_array($localeBundle['Scripts']), self::$denylist),
7373
];
7474

7575
$this->scriptCodes = array_merge($this->scriptCodes, array_keys($data['Names']));

0 commit comments

Comments
 (0)