Skip to content

Commit b2af5ce

Browse files
Merge branch '3.4' into 4.2
* 3.4: (24 commits) Apply php-cs-fixer rule for array_key_exists() [Security] Change FormAuthenticator if condition handles multi-byte characters in autocomplete speed up tests running them without debug flag [Translations] added missing Croatian validators Fix getItems() performance issue with RedisCluster (php-redis) [VarDumper] Keep a ref to objects to ensure their handle cannot be reused while cloning IntegerType: reject submitted non-integer numbers be keen to newcomers [HttpKernel] Fix possible infinite loop of exceptions fixed CS [Validator] Added missing translations for Afrikaans do not validate non-submitted form fields in PATCH requests Update usage example in ArrayInput doc block. [Console] Prevent ArgvInput::getFirstArgument() from returning an option value [Validator] Fixed duplicate UUID fixed CS [EventDispatcher] Fix unknown priority Avoid mutating the Finder when building the iterator [Validator] Add the missing translations for the Greek (el) locale ...
2 parents c657c81 + 10050c2 commit b2af5ce

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Data/Generator/LocaleDataGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ private function generateLocaleName($locale, $displayLocale)
164164
// the name sorting
165165
// $name = $this->langBundle->getLanguageName($displayLocale, $lang, $region);
166166

167-
// Some languages are simply not translated
167+
// Some languages are not translated
168168
// Example: "az" (Azerbaijani) has no translation in "af" (Afrikaans)
169169
if (null === ($name = $this->languageDataProvider->getName($lang, $displayLocale))) {
170170
return;

Data/Util/RecursiveArrayAccess.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static function get($array, array $indices)
2525
foreach ($indices as $index) {
2626
// Use array_key_exists() for arrays, isset() otherwise
2727
if (\is_array($array)) {
28-
if (array_key_exists($index, $array)) {
28+
if (\array_key_exists($index, $array)) {
2929
$array = $array[$index];
3030
continue;
3131
}

NumberFormatter/NumberFormatter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ public function getPattern()
460460
*/
461461
public function getSymbol($attr)
462462
{
463-
return array_key_exists($this->style, self::$enSymbols) && array_key_exists($attr, self::$enSymbols[$this->style]) ? self::$enSymbols[$this->style][$attr] : false;
463+
return \array_key_exists($this->style, self::$enSymbols) && \array_key_exists($attr, self::$enSymbols[$this->style]) ? self::$enSymbols[$this->style][$attr] : false;
464464
}
465465

466466
/**
@@ -474,7 +474,7 @@ public function getSymbol($attr)
474474
*/
475475
public function getTextAttribute($attr)
476476
{
477-
return array_key_exists($this->style, self::$enTextAttributes) && array_key_exists($attr, self::$enTextAttributes[$this->style]) ? self::$enTextAttributes[$this->style][$attr] : false;
477+
return \array_key_exists($this->style, self::$enTextAttributes) && \array_key_exists($attr, self::$enTextAttributes[$this->style]) ? self::$enTextAttributes[$this->style][$attr] : false;
478478
}
479479

480480
/**

0 commit comments

Comments
 (0)