github: 32996 Add RegionProvider to be responsible for region related directory data

Author: paras89

app/code/Magento/Customer/ViewModel/Address/RegionProvider.php

@@ -1,76 +1,35 @@
 <?php
 /**
- * RegionProvider
- *
- * @copyright Copyright © 2021 Staempfli AG. All rights reserved.
- * @author    juan.alonso@staempfli.com
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Customer\ViewModel\Address;
 
-use Magento\Directory\Helper\Data as DataHelper;
-use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
+use Magento\Directory\Model\RegionProvider as DirectoryRegionProvider;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 
 class RegionProvider implements ArgumentInterface
 {
 
-
-    protected $regions = [];
-
-    /**
-     * @var DataHelper
-     */
-    private $directoryHelper;
     /**
-     * @var JsonSerializer
+     * @var DirectoryRegionProvider
      */
-    private $jsonSerializer;
-
+    private $directoryRegionProvider;
 
     /**
      * Constructor
      *
-     * @param DataHelper $directoryHelper
-     * @param JsonSerializer $jsonSerializer
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @param DirectoryRegionProvider $directoryRegionProvider
      */
     public function __construct(
-        DataHelper $directoryHelper,
-        JsonSerializer $jsonSerializer
+        DirectoryRegionProvider $directoryRegionProvider
     ) {
-        $this->directoryHelper= $directoryHelper;
-        $this->jsonSerializer = $jsonSerializer;
+        $this->directoryRegionProvider = $directoryRegionProvider;
     }
 
     public function getRegionJson() : string
     {
-        $regions = $this->getRegions();
-        return $this->jsonSerializer->serialize($regions);
+        return $this->directoryRegionProvider->getRegionJson();
     }
-
-
-    /**
-     * @return array
-     */
-    protected function getRegions() : array
-    {
-        if (!$this->regions) {
-            $regions = $this->directoryHelper->getRegionData();
-            $this->regions['config'] = $regions['config'];
-            unset($regions['config']);
-            foreach ($regions as $countryCode => $countryRegions) {
-                foreach ($countryRegions as $regionId => $regionData) {
-                    $this->regions[$countryCode][] = [
-                        'id'   => $regionId,
-                        'name' => $regionData['name'],
-                        'code' => $regionData['code']
-                    ];
-                }
-            }
-
-        }
-        return $this->regions;
-    }
-
 }

app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml

@@ -18,7 +18,6 @@
                 <arguments>
                     <argument name="attribute_data" xsi:type="object">Magento\Customer\Block\DataProviders\AddressAttributeData</argument>
                     <argument name="region_provider" xsi:type="object">Magento\Customer\ViewModel\Address\RegionProvider</argument>
-                    <argument name="show_address_fields" xsi:type="boolean">true</argument>
                 </arguments>
                 <container name="form.additional.info" as="form_additional_info"/>
                 <container name="customer.form.register.fields.before" as="form_fields_before" label="Form Fields Before" htmlTag="div" htmlClass="customer-form-before"/>

app/code/Magento/Directory/Model/RegionProvider.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Directory\Model;
+
+use Magento\Directory\Helper\Data as DataHelper;
+use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
+
+class RegionProvider
+{
+    private $regions;
+    /**
+     * @var DataHelper
+     */
+    private $directoryHelper;
+    /**
+     * @var JsonSerializer
+     */
+    private $jsonSerializer;
+
+    /**
+     * Constructor
+     *
+     * @param DataHelper $directoryHelper
+     * @param JsonSerializer $jsonSerializer
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        DataHelper $directoryHelper,
+        JsonSerializer $jsonSerializer
+    ) {
+        $this->directoryHelper= $directoryHelper;
+        $this->jsonSerializer = $jsonSerializer;
+    }
+
+    public function getRegionJson() : string
+    {
+        $regions = $this->getRegions();
+        return $this->jsonSerializer->serialize($regions);
+    }
+
+    /**
+     * @return array
+     */
+    protected function getRegions() : array
+    {
+        if (!$this->regions) {
+            $regions = $this->directoryHelper->getRegionData();
+            $this->regions['config'] = $regions['config'];
+            unset($regions['config']);
+            foreach ($regions as $countryCode => $countryRegions) {
+                foreach ($countryRegions as $regionId => $regionData) {
+                    $this->regions[$countryCode][] = [
+                        'id'   => $regionId,
+                        'name' => $regionData['name'],
+                        'code' => $regionData['code']
+                    ];
+                }
+            }
+        }
+        return $this->regions;
+    }
+}