MERGE: Merge branch '5.0' into 5.1

kdambekalns · Apr 30, 2020 · d29e6bb · d29e6bb
2 parents aca6493 + 42c57b2
commit d29e6bb
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Neos.Flow/Classes/I18n/Cldr/Reader/NumbersReader.php b/Neos.Flow/Classes/I18n/Cldr/Reader/NumbersReader.php
@@ -223,8 +223,9 @@ public function parseFormatFromCldr(Locale $locale, $formatType, $formatLength =
         self::validateFormatType($formatType);
         self::validateFormatLength($formatLength);
 
-        if (isset($this->parsedFormatsIndices[(string)$locale][$formatType][$formatLength])) {
-            return $this->parsedFormats[$this->parsedFormatsIndices[(string)$locale][$formatType][$formatLength]];
+        $parsedFormatIndex = $this->parsedFormatsIndices[(string)$locale][$formatType][$formatLength] ?? '';
+        if (isset($this->parsedFormats[$parsedFormatIndex])) {
+            return $this->parsedFormats[$parsedFormatIndex];
         }
 
         if ($formatLength === self::FORMAT_LENGTH_DEFAULT) {