🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests: - #18155: Fix type hint of @message declaration as the "setWidgetParameters" method allows arrays too (by @avstudnitz) - #18401: Admin > Footer > Aligning Proportionally (by @rafaelstz) - #17516: Feature australian regions (by @maximbaibakov) Fixed GitHub Issues: - #17514: Add Australian regions (reported by @maximbaibakov) has been fixed in #17516 by @maximbaibakov in 2.2-develop branch Related commits: 1. 1b8b012 2. b1fcec4 3. 020ca36 4. ebb517b
magento · Oct 11, 2018 · 06274cb · 06274cb
2 parents 74aa43b + 9f1fe7f
commit 06274cb
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/app/code/Magento/Directory/Setup/UpgradeData.php b/app/code/Magento/Directory/Setup/UpgradeData.php
@@ -46,6 +46,9 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
         if (version_compare($context->getVersion(), '2.0.2', '<')) {
             $this->addCountryRegions($setup, 'IN', $this->getDataForIndia());
         }
+        if (version_compare($context->getVersion(), '2.0.3', '<')) {
+            $this->addCountryRegions($setup, 'AU', $this->getDataForAustralia());
+        }
     }
 
     /**
@@ -127,6 +130,25 @@ private function getDataForIndia()
         ];
     }
 
+    /**
+     * Australian states data.
+     *
+     * @return array
+     */
+    private function getDataForAustralia()
+    {
+        return [
+            'ACT' => 'Australian Capital Territory',
+            'NSW' => 'New South Wales',
+            'VIC' => 'Victoria',
+            'QLD' => 'Queensland',
+            'SA' => 'South Australia',
+            'TAS' => 'Tasmania',
+            'WA' => 'Western Australia',
+            'NT' => 'Northern Territory'
+        ];
+    }
+
     /**
      * Add country regions data to appropriate tables.
      *

diff --git a/app/code/Magento/Directory/etc/module.xml b/app/code/Magento/Directory/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Directory" setup_version="2.0.2">
+    <module name="Magento_Directory" setup_version="2.0.3">
         <sequence>
             <module name="Magento_Store"/>
         </sequence>

diff --git a/app/code/Magento/Widget/Model/Widget/Instance.php b/app/code/Magento/Widget/Model/Widget/Instance.php
@@ -15,7 +15,7 @@
  * @method string getTitle()
  * @method \Magento\Widget\Model\Widget\Instance setTitle(string $value)
  * @method \Magento\Widget\Model\Widget\Instance setStoreIds(string $value)
- * @method \Magento\Widget\Model\Widget\Instance setWidgetParameters(string $value)
+ * @method \Magento\Widget\Model\Widget\Instance setWidgetParameters(string|array $value)
  * @method int getSortOrder()
  * @method \Magento\Widget\Model\Widget\Instance setSortOrder(int $value)
  * @method \Magento\Widget\Model\Widget\Instance setThemeId(int $value)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_footer.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_footer.less
@@ -25,7 +25,7 @@
     border-top: @footer__border-width solid @footer__border-color;
     color: @footer__color;
     margin-top: auto;
-    padding: 2.6rem 2rem 6rem 3rem;
+    padding: 2.6rem 3rem 6rem;
 
     a {
         .lib-link(