[Fix] Add required countries only for IN and HR while keeping previous functionality

Author: jalogut

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

@@ -64,8 +64,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
     private $allowedCountriesReader;
 
     /**
-     * @deprecated
-     *
      * @var string[]
      * @since 100.1.0
      */

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

@@ -842,5 +842,16 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
                 'value' => 1
             ]
         );
+
+        $countries = $this->directoryData->getCountryCollection()->getCountriesWithRequiredStates();
+        $setup->getConnection()->insert(
+            $setup->getTable('core_config_data'),
+            [
+                'scope' => 'default',
+                'scope_id' => 0,
+                'path' => Data::XML_PATH_STATES_REQUIRED,
+                'value' => implode(',', array_keys($countries))
+            ]
+        );
     }
 }

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

@@ -148,5 +148,20 @@ private function addCountryRegions(ModuleDataSetupInterface $setup, string $coun
             $bind = ['locale' => 'en_US', 'region_id' => $regionId, 'name' => $name];
             $setup->getConnection()->insert($setup->getTable('directory_country_region_name'), $bind);
         }
+
+        /**
+         * Upgrade core_config_data general/region/state_required field.
+         */
+        $setup->getConnection()->update(
+            $setup->getTable('core_config_data'),
+            [
+                'value' => new \Zend_Db_Expr("CONCAT(value, '," . $countryId . "')")
+            ],
+            [
+                'scope="default"',
+                'scope_id=0',
+                'path=?' => Data::XML_PATH_STATES_REQUIRED
+            ]
+        );
     }
 }

app/code/Magento/Directory/etc/di.xml

@@ -34,6 +34,10 @@
     <type name="Magento\Directory\Model\ResourceModel\Country\Collection" shared="false">
         <arguments>
             <argument name="helperData" xsi:type="object">DirectoryHelperDataProxy</argument>
+            <argument name="countriesWithNotRequiredStates" xsi:type="array">
+                <item name="FR" xsi:type="string">FR</item>
+                <item name="DE" xsi:type="string">DE</item>
+            </argument>
         </arguments>
     </type>
     <preference for="Magento\Directory\Model\Country\Postcode\ConfigInterface" type="Magento\Directory\Model\Country\Postcode\Config" />