🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #15549: Fixed typo error (by @vgelani)
 - #15552: Remove extra space and format the code in translation file (by @saurabh-aureate)
 - #15519: Typo correction (by @saurabh-aureate)
 - #15517: Use stored value of method instead of calling same method again. (by @saurabh-aureate)
 - #15468: Issue 15467 where a configuration sku gets deleted but is still saved� (by @jonshipman)
 - #15459: [Resolved : UI Component listing action column outside of screen when… (by @hitesh-wagento)
 - #15514: Fix method name (typo) (by @avoelkl)


Fixed GitHub Issues:
 - #15467: Cart does not load when Configuration product option is deleted and that option is in the cart (reported by @jonshipman) has been fixed in #15468 by @jonshipman in 2.2-develop branch
   Related commits:
     1. 1e36495
     2. caa818e

 - #14153: UI Component listing action column outside of screen when too many columns (reported by @milansimek) has been fixed in #15459 by @hitesh-wagento in 2.2-develop branch
   Related commits:
     1. 2cc78bc

Author: magento-engcom-team

app/code/Magento/Captcha/i18n/en_US.csv

@@ -20,11 +20,7 @@ Forms,Forms
 "Number of Symbols","Number of Symbols"
 "Please specify 8 symbols at the most. Range allowed (e.g. 3-5)","Please specify 8 symbols at the most. Range allowed (e.g. 3-5)"
 "Symbols Used in CAPTCHA","Symbols Used in CAPTCHA"
-"
-                        Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
-                    ","
-                        Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.
-                    "
+"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.","Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.<br />Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer."
 "Case Sensitive","Case Sensitive"
 "Enable CAPTCHA on Storefront","Enable CAPTCHA on Storefront"
 "CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen.","CAPTCHA for ""Create user"" and ""Forgot password"" forms is always enabled if chosen."

app/code/Magento/Catalog/Model/Product/Type/AbstractType.php

@@ -251,7 +251,7 @@ public function getChildrenIds($parentId, $required = true)
     }
 
     /**
-     * Retrieve parent ids array by requered child
+     * Retrieve parent ids array by required child
      *
      * @param int|array $childId
      * @return array

app/code/Magento/Config/Block/System/Config/Form.php

@@ -709,7 +709,7 @@ protected function _getAdditionalElementTypes()
     }
 
     /**
-     * Temporary moved those $this->getRequest()->getParam('blabla') from the code accross this block
+     * Temporary moved those $this->getRequest()->getParam('blabla') from the code across this block
      * to getBlala() methods to be later set from controller with setters
      */
 

app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php

@@ -637,7 +637,7 @@ protected function _insertData()
     }
 
     /**
-     * Get new supper attribute id.
+     * Get new super attribute id.
      *
      * @return int
      */

app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php

@@ -68,7 +68,11 @@ public function getProductForThumbnail()
             self::CONFIG_THUMBNAIL_SOURCE,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) == ThumbnailSource::OPTION_USE_PARENT_IMAGE ||
-            !($this->getChildProduct()->getThumbnail() && $this->getChildProduct()->getThumbnail() != 'no_selection')
+            !(
+                $this->getChildProduct() &&
+                $this->getChildProduct()->getThumbnail() &&
+                $this->getChildProduct()->getThumbnail() != 'no_selection'
+            )
         ) {
             $product = $this->getProduct();
         } else {

app/code/Magento/ConfigurableProduct/CustomerData/ConfigurableItem.php

@@ -63,7 +63,11 @@ protected function getProductForThumbnail()
         );
 
         $product = $config == ThumbnailSource::OPTION_USE_PARENT_IMAGE
-            || (!$this->getChildProduct()->getThumbnail() || $this->getChildProduct()->getThumbnail() == 'no_selection')
+            || (
+                !$this->getChildProduct() ||
+                !$this->getChildProduct()->getThumbnail() ||
+                $this->getChildProduct()->getThumbnail() == 'no_selection'
+            )
             ? $this->getProduct()
             : $this->getChildProduct();
 

app/code/Magento/Customer/Model/Session.php

@@ -555,7 +555,7 @@ public function setAfterAuthUrl($url)
     }
 
     /**
-     * Reset core session hosts after reseting session ID
+     * Reset core session hosts after resetting session ID
      *
      * @return $this
      */

app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml

@@ -11,7 +11,7 @@
 $partners = $block->getPartners();
 ?>
 <?php if ($partners) : ?>
-    <?php foreach ($block->getPartners() as $partner) : ?>
+    <?php foreach ($partners as $partner) : ?>
         <div class="partner">
             <img
                 class="partner-image"

app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php

@@ -5,7 +5,7 @@
  */
 
 /**
- * Multishipping checkout base abstract block
+ * Mustishipping checkout base abstract block
  *
  * @author      Magento Core Team <[email protected]>
  */

app/code/Magento/Multishipping/Block/Checkout/Overview.php

@@ -319,9 +319,19 @@ public function getQuote()
     }
 
     /**
+     * @deprecated
+     * typo in method name, see getBillingAddressTotals()
      * @return mixed
      */
     public function getBillinAddressTotals()
+    {
+        return $this->getBillingAddressTotals();
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getBillingAddressTotals()
     {
         $address = $this->getQuote()->getBillingAddress();
         return $this->getShippingAddressTotals($address);