Revert "#37796: Fixed issue with adding new country regions"

This reverts commit 65e0ea4.

Author: Indraniks

app/code/Magento/Directory/Setup/DataInstaller.php

@@ -6,53 +6,46 @@
 
 namespace Magento\Directory\Setup;
 
-use Magento\Directory\Helper\Data;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 
 /**
- * Add Required Regions for Country
+ * Class DataInstaller
+ * @package Magento\Directory\Setup
  */
 class DataInstaller
 {
+    /**
+     * @var \Magento\Directory\Helper\Data
+     */
+    private $data;
+
     /**
      * @var ResourceConnection
      */
     private $resourceConnection;
 
     /**
      * DatInstaller constructor.
-     *
+     * @param \Magento\Directory\Helper\Data $data
      * @param ResourceConnection $resourceConnection
      */
     public function __construct(
+        \Magento\Directory\Helper\Data $data,
         ResourceConnection $resourceConnection
     ) {
+        $this->data = $data;
         $this->resourceConnection = $resourceConnection;
     }
 
     /**
      * Add country-region data.
      *
-     * @param  AdapterInterface $adapter
-     * @param  array $data
-     * @return void
+     * @param AdapterInterface $adapter
+     * @param array $data
      */
-    public function addCountryRegions(AdapterInterface $adapter, array $data): void
+    public function addCountryRegions(AdapterInterface $adapter, array $data)
     {
-        $where = [
-            $adapter->quoteInto('path = ?', Data::XML_PATH_STATES_REQUIRED),
-            $adapter->quoteInto('scope = ?', 'default'),
-            $adapter->quoteInto('scope_id = ?', 0),
-        ];
-
-        $select = $adapter->select()
-            ->from($this->resourceConnection->getTableName('core_config_data'), 'value')
-            ->where(implode(' AND ', $where));
-
-        $currRequiredStates = $adapter->fetchOne($select);
-        $currRequiredStates = (!empty($currRequiredStates)) ? explode(',', $currRequiredStates) : [];
-
         /**
          * Fill table directory/country_region
          * Fill table directory/country_region_name for en_US locale
@@ -63,21 +56,21 @@ public function addCountryRegions(AdapterInterface $adapter, array $data): void
             $regionId = $adapter->lastInsertId($this->resourceConnection->getTableName('directory_country_region'));
             $bind = ['locale' => 'en_US', 'region_id' => $regionId, 'name' => $row[2]];
             $adapter->insert($this->resourceConnection->getTableName('directory_country_region_name'), $bind);
-
-            if (!in_array($row[0], $currRequiredStates)) {
-                $currRequiredStates[] = $row[0];
-            }
         }
-
         /**
          * Upgrade core_config_data general/region/state_required field.
          */
+        $countries = $this->data->getCountryCollection()->getCountriesWithRequiredStates();
         $adapter->update(
             $this->resourceConnection->getTableName('core_config_data'),
             [
-                'value' => implode(',', $currRequiredStates)
+                'value' => implode(',', array_keys($countries))
             ],
-            $where
+            [
+                'scope="default"',
+                'scope_id=0',
+                'path=?' => \Magento\Directory\Helper\Data::XML_PATH_STATES_REQUIRED
+            ]
         );
     }
 }