🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #15718: [Backport 2.2] Fixed return type of wishlist's getImageData in DocBlock (by @rogyar)
 - #15715: [BACKPORT 2.2 #15695] Fixed a couple of typos (by @dverkade)
 - #15566: Fixxes #15565 (by @EliasKotlyar)


Fixed GitHub Issues:
 - #15565: Getting wrong frontend-controller, when using storecodes in urls (reported by @EliasKotlyar) has been fixed in #15566 by @EliasKotlyar in 2.2-develop branch
   Related commits:
     1. 1cbb265
     2. 4d886b2

Author: magento-engcom-team

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php

@@ -71,7 +71,7 @@ public function canDisplay()
     }
 
     /**
-     * Retrieve disply item qty availablity
+     * Retrieve display item qty availability
      *
      * @return false
      */

app/code/Magento/Store/Model/PathConfig.php

@@ -83,6 +83,8 @@ public function shouldBeSecure($path)
      */
     public function getDefaultPath()
     {
-        return $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE);
+        $store = $this->storeManager->getStore();
+        $value = $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE, $store);
+        return $value;
     }
 }

app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js

@@ -115,14 +115,14 @@ define([
          * @returns {Group} Chainable.
          */
         _setClasses: function () {
-            var addtional = this.additionalClasses,
+            var additional = this.additionalClasses,
                 classes;
 
-            if (_.isString(addtional)) {
-                addtional = this.additionalClasses.split(' ');
+            if (_.isString(additional)) {
+                additional = this.additionalClasses.split(' ');
                 classes = this.additionalClasses = {};
 
-                addtional.forEach(function (name) {
+                additional.forEach(function (name) {
                     classes[name] = true;
                 }, this);
             }

app/code/Magento/Ui/view/base/web/js/form/components/group.js

@@ -58,14 +58,14 @@ define([
          * @returns {Group} Chainable.
          */
         _setClasses: function () {
-            var addtional = this.additionalClasses,
+            var additional = this.additionalClasses,
                 classes;
 
-            if (_.isString(addtional)) {
-                addtional = this.additionalClasses.split(' ');
+            if (_.isString(additional)) {
+                additional = this.additionalClasses.split(' ');
                 classes = this.additionalClasses = {};
 
-                addtional.forEach(function (name) {
+                additional.forEach(function (name) {
                     classes[name] = true;
                 }, this);
             }

app/code/Magento/Wishlist/CustomerData/Wishlist.php

@@ -142,7 +142,7 @@ protected function getItemData(\Magento\Wishlist\Model\Item $wishlistItem)
      * Retrieve product image data
      *
      * @param \Magento\Catalog\Model\Product $product
-     * @return \Magento\Catalog\Block\Product\Image
+     * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function getImageData($product)

setup/pub/angular-sanitize/angular-sanitize.js

@@ -159,7 +159,7 @@
         END_TAG_REGEXP = /^<\s*\/\s*([\w:-]+)[^>]*>/,
         ATTR_REGEXP = /([\w:-]+)(?:\s*=\s*(?:(?:"((?:[^"])*)")|(?:'((?:[^'])*)')|([^>\s]+)))?/g,
         BEGIN_TAG_REGEXP = /^</,
-        BEGING_END_TAGE_REGEXP = /^<\s*\//,
+        BEGIN_END_TAGE_REGEXP = /^<\s*\//,
         COMMENT_REGEXP = /<!--(.*?)-->/g,
         DOCTYPE_REGEXP = /<!DOCTYPE([^>]*?)>/i,
         CDATA_REGEXP = /<!\[CDATA\[(.*?)]]>/g,
@@ -260,7 +260,7 @@
                         chars = false;
                     }
                     // end tag
-                } else if ( BEGING_END_TAGE_REGEXP.test(html) ) {
+                } else if ( BEGIN_END_TAGE_REGEXP.test(html) ) {
                     match = html.match( END_TAG_REGEXP );
 
                     if ( match ) {