Merge remote-tracking branch 'goinc/MAGETWO-37873' into MAGETWO-37985

Author: Leonid Poluyanov

lib/internal/Magento/Framework/Locale/TranslatedLists.php

@@ -67,13 +67,13 @@ public function getTranslatedOptionLocales()
     protected function _getOptionLocales($translatedName = false)
     {
         $currentLocale = $this->localeResolver->getLocale();
-        $locales = \ResourceBundle::getLocales(null);
+        $locales = \ResourceBundle::getLocales('') ?: [];
         $languages = (new LanguageBundle())->get($currentLocale)['Languages'];
         $countries = (new RegionBundle())->get($currentLocale)['Countries'];
 
         $options = [];
         $allowedLocales = $this->_config->getAllowedLocales();
-        foreach ((array)$locales as $locale) {
+        foreach ($locales as $locale) {
             if (!in_array($locale, $allowedLocales)) {
                 continue;
             }
@@ -103,7 +103,7 @@ public function getOptionTimezones()
     {
         $options = [];
         $locale = $this->localeResolver->getLocale();
-        $zones = \DateTimeZone::listIdentifiers(\DateTimeZone::ALL);
+        $zones = \DateTimeZone::listIdentifiers(\DateTimeZone::ALL) ?: [];
         foreach ($zones as $code) {
             $options[] = [
                 'label' => \IntlTimeZone::createTimeZone($code)->getDisplayName(
@@ -123,9 +123,8 @@ public function getOptionTimezones()
     public function getOptionWeekdays($preserveCodes = false, $ucFirstCode = false)
     {
         $options = [];
-        $days = (new DataBundle())->get(
-            $this->localeResolver->getLocale()
-        )['calendar']['gregorian']['dayNames']['format']['wide'];
+        $days = (new DataBundle())
+            ->get($this->localeResolver->getLocale())['calendar']['gregorian']['dayNames']['format']['wide'] ?: [];
         $englishDays = (new DataBundle())->get('en_US')['calendar']['gregorian']['dayNames']['format']['abbreviated'];
         foreach ($days as $code => $name) {
             $code = $preserveCodes ? $englishDays[$code] : $code;
@@ -140,7 +139,7 @@ public function getOptionWeekdays($preserveCodes = false, $ucFirstCode = false)
     public function getOptionCountries()
     {
         $options = [];
-        $countries = (new RegionBundle())->get($this->localeResolver->getLocale())['Countries'];
+        $countries = (new RegionBundle())->get($this->localeResolver->getLocale())['Countries'] ?: [];
         foreach ($countries as $code => $name) {
             $options[] = ['label' => $name, 'value' => $code];
         }
@@ -152,7 +151,7 @@ public function getOptionCountries()
      */
     public function getOptionCurrencies()
     {
-        $currencies = (new CurrencyBundle())->get($this->localeResolver->getLocale())['Currencies'];
+        $currencies = (new CurrencyBundle())->get($this->localeResolver->getLocale())['Currencies'] ?: [];
         $options = [];
         $allowed = $this->_config->getAllowedCurrencies();
         foreach ($currencies as $code => $data) {
@@ -169,7 +168,7 @@ public function getOptionCurrencies()
      */
     public function getOptionAllCurrencies()
     {
-        $currencies = (new CurrencyBundle())->get($this->localeResolver->getLocale())['Currencies'];
+        $currencies = (new CurrencyBundle())->get($this->localeResolver->getLocale())['Currencies'] ?: [];
         $options = [];
         foreach ($currencies as $code => $data) {
             $options[] = ['label' => $data[1], 'value' => $code];

lib/internal/Magento/Framework/Setup/Lists.php

@@ -79,9 +79,9 @@ public function getLocaleList()
     {
         $languages = (new LanguageBundle())->get(Resolver::DEFAULT_LOCALE)['Languages'];
         $countries = (new RegionBundle())->get(Resolver::DEFAULT_LOCALE)['Countries'];
-        $locales = \ResourceBundle::getLocales(null);
+        $locales = \ResourceBundle::getLocales('') ?: [];
         $list = [];
-        foreach ((array)$locales as $locale) {
+        foreach ($locales as $locale) {
             if (!in_array($locale, $this->allowedLocales)) {
                 continue;
             }