FRW-8812 Fixed non infrastructural places with different behaviour fo…

…r Dynamic Multistore ON/OFF mode. (#11042)

FRW-8812 Fixed non infrastructural places with different behaviour for DS ON and DS OFF.

src/Spryker/Zed/Customer/Communication/Form/DataProvider/AddressFormDataProvider.php

@@ -47,7 +47,7 @@ public function __construct(
     /**
      * @param int|null $idCustomerAddress
      *
-     * @return array
+     * @return array<string, mixed>
      */
     public function getData($idCustomerAddress = null)
     {
@@ -76,33 +76,27 @@ public function getOptions()
      */
     protected function getCountryChoices(): array
     {
-        $result = [];
+        $countries = $this->countryFacade->getAvailableCountries()
+            ->getCountries()
+            ->getIterator()
+            ->getArrayCopy();
 
-        foreach ($this->getContries() as $countryTransfer) {
-            $result[$countryTransfer->getIdCountry()] = $countryTransfer->getName();
-        }
-
-        return $result;
+        return $this->getCountryNamesIndexedByCountryId($countries);
     }
 
     /**
-     * @return array<\Generated\Shared\Transfer\CountryTransfer>
+     * @param array<\Generated\Shared\Transfer\CountryTransfer> $countries
+     *
+     * @return array<int|string, string|null>
      */
-    protected function getContries(): array
+    protected function getCountryNamesIndexedByCountryId(array $countries): array
     {
-        if ($this->storeFacade->isDynamicStoreEnabled()) {
-            return $this->countryFacade->getAvailableCountries()
-                ->getCountries()
-                ->getIterator()
-                ->getArrayCopy();
-        }
-
-        $countryTransfers = [];
+        $result = [];
 
-        foreach ($this->storeFacade->getCurrentStore()->getCountries() as $iso2Code) {
-            $countryTransfers[] = $this->countryFacade->getCountryByIso2Code($iso2Code);
+        foreach ($countries as $countryTransfer) {
+            $result[$countryTransfer->getIdCountry()] = $countryTransfer->getName();
         }
 
-        return $countryTransfers;
+        return $result;
     }
 }