Merge remote-tracking branch 'origin/MAGETWO-99424' into 2.3-develop-pr22

Author: serhii-balko

app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php

@@ -126,24 +126,6 @@ public function __construct(
      */
     protected $_foregroundCountries = [];
 
-    /**
-     * Add top destinition countries to head of option array
-     *
-     * @param string $emptyLabel
-     * @param array $options
-     * @return array
-     */
-    private function addForegroundCountriesToOptionArray($emptyLabel, $options)
-    {
-        if ($emptyLabel !== false && count($this->_foregroundCountries) !== 0 &&
-            count($options) === count($this->_foregroundCountries)
-        ) {
-            $options[] = ['value' => '', 'label' => $emptyLabel];
-            return $options;
-        }
-        return $options;
-    }
-
     /**
      * Define main table
      *
@@ -269,24 +251,20 @@ public function addCountryIdFilter($countryId)
     public function toOptionArray($emptyLabel = ' ')
     {
         $options = $this->_toOptionArray('country_id', 'name', ['title' => 'iso2_code']);
-        $sort = [];
-        foreach ($options as $data) {
-            $name = (string)$this->_localeLists->getCountryTranslation($data['value']);
-            if (!empty($name)) {
-                $sort[$name] = $data['value'];
-            }
-        }
+        $sort = $this->getSort($options);
+
         $this->_arrayUtils->ksortMultibyte($sort, $this->_localeResolver->getLocale());
         foreach (array_reverse($this->_foregroundCountries) as $foregroundCountry) {
             $name = array_search($foregroundCountry, $sort);
-            unset($sort[$name]);
-            $sort = [$name => $foregroundCountry] + $sort;
+            if ($name) {
+                unset($sort[$name]);
+                $sort = [$name => $foregroundCountry] + $sort;
+            }
         }
         $isRegionVisible = (bool)$this->helperData->isShowNonRequiredState();
 
         $options = [];
         foreach ($sort as $label => $value) {
-            $options = $this->addForegroundCountriesToOptionArray($emptyLabel, $options);
             $option = ['value' => $value, 'label' => $label];
             if ($this->helperData->isRegionRequired($value)) {
                 $option['is_region_required'] = true;
@@ -366,4 +344,23 @@ public function getCountriesWithRequiredStates()
         }
         return $countries;
     }
+
+    /**
+     * Get sort
+     *
+     * @param array $options
+     * @return array
+     */
+    private function getSort(array $options): array
+    {
+        $sort = [];
+        foreach ($options as $data) {
+            $name = (string)$this->_localeLists->getCountryTranslation($data['value']);
+            if (!empty($name)) {
+                $sort[$name] = $data['value'];
+            }
+        }
+
+        return $sort;
+    }
 }

app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Country/CollectionTest.php

@@ -99,8 +99,7 @@ public function testToOptionArray($optionsArray, $emptyLabel, $foregroundCountri
 
         $this->_model->setForegroundCountries($foregroundCountries);
         $result = $this->_model->toOptionArray($emptyLabel);
-        $this->assertCount(count($optionsArray) + (int)(!empty($emptyLabel) && !empty($foregroundCountries)) +
-            (int)(!empty($emptyLabel)), $result);
+        $this->assertCount(count($optionsArray) + (int)(!empty($emptyLabel)), $result);
         foreach ($expectedResults as $index => $expectedResult) {
             $this->assertEquals($expectedResult, $result[$index]['label']);
         }
@@ -121,8 +120,10 @@ public function toOptionArrayDataProvider()
             [$optionsArray, false, [], ['AD', 'US', 'ES', 'BZ']],
             [$optionsArray, false, 'US', ['US', 'AD', 'ES', 'BZ']],
             [$optionsArray, false, ['US', 'BZ'], ['US', 'BZ', 'AD', 'ES']],
-            [$optionsArray, ' ', 'US', [' ', 'US', ' ', 'AD', 'ES', 'BZ']],
-            [$optionsArray, ' ', [], [' ', 'AD', 'US', 'ES', 'BZ']]
+            [$optionsArray, ' ', 'US', [' ', 'US', 'AD', 'ES', 'BZ']],
+            [$optionsArray, ' ', [], [' ', 'AD', 'US', 'ES', 'BZ']],
+            [$optionsArray, ' ', 'UA', [' ', 'AD', 'US', 'ES', 'BZ']],
+            [$optionsArray, ' ', ['AF', 'UA'], [' ', 'AD', 'US', 'ES', 'BZ']],
         ];
     }
 }