MAGETWO-34253: CLONE - Postal code is still mandatory for Non-US addresses that don't use it

 - Fix data-source with 'is_region_required' value

Author: guz-anton

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

@@ -44,6 +44,11 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
      */
     protected $_localeResolver;
 
+    /**
+     * @var \Magento\Directory\Helper\Data
+     */
+    protected $helperData;
+
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Psr\Log\LoggerInterface $logger
@@ -68,6 +73,7 @@ public function __construct(
         \Magento\Directory\Model\Resource\CountryFactory $countryFactory,
         \Magento\Framework\Stdlib\ArrayUtils $arrayUtils,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
+        \Magento\Framework\App\Helper\AbstractHelper $helperData,
         $connection = null,
         \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
     ) {
@@ -77,6 +83,7 @@ public function __construct(
         $this->_localeResolver = $localeResolver;
         $this->_countryFactory = $countryFactory;
         $this->_arrayUtils = $arrayUtils;
+        $this->helperData = $helperData;
     }
 
     /**
@@ -208,7 +215,11 @@ public function toOptionArray($emptyLabel = ' ')
         }
         $options = [];
         foreach ($sort as $label => $value) {
-            $options[] = ['value' => $value, 'label' => $label];
+            $option = ['value' => $value, 'label' => $label];
+            if ($this->helperData->isRegionRequired($value)) {
+                $option['is_region_required'] = 'true';
+            }
+            $options[] = $option;
         }
 
         if (count($options) > 0 && $emptyLabel !== false) {

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

@@ -6,7 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
-    <type name="Magento\Directory\Model\Resource\Country\Collection" shared="false" />
     <type name="Magento\Directory\Model\Currency\Import\Config">
         <arguments>
             <argument name="servicesConfig" xsi:type="array">
@@ -17,4 +16,15 @@
             </argument>
         </arguments>
     </type>
+
+    <virtualType name="DirectoryHelperDataProxy" type="Magento\Directory\Helper\Data\Proxy">
+        <arguments>
+            <argument name="instanceName" xsi:type="string">Magento\Directory\Helper\Data</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Directory\Model\Resource\Country\Collection" shared="false">
+        <arguments>
+            <argument name="helperData" xsi:type="object">DirectoryHelperDataProxy</argument>
+        </arguments>
+    </type>
 </config>