🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #16812: [Backport] Issue 15467 where a configuration sku gets deleted but is still saved… (by @mage2pratik)
 - #16801: [Backport] #16184: Fix type error in payment void method (by @gelanivishal)


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 #16812 by @mage2pratik in 2.1-develop branch
   Related commits:
     1. d6e8ce9
     2. 66dc4d8

 - #16184: Argument 1 passed to Magento\Sales\Model\Order\Payment must be an instance of Magento\Framework\DataObject, none given (reported by @Jakhotiya) has been fixed in #16801 by @gelanivishal in 2.1-develop branch
   Related commits:
     1. 25a71d5

Author: Stanislav Idolov

app/code/Magento/Authorizenet/Model/Directpost.php

@@ -820,11 +820,14 @@ protected function declineOrder(\Magento\Sales\Model\Order $order, $message = ''
     {
         try {
             $response = $this->getResponse();
-            if (
-                $voidPayment && $response->getXTransId() && strtoupper($response->getXType())
-                == self::REQUEST_TYPE_AUTH_ONLY
+            if ($voidPayment
+                && $response->getXTransId()
+                && strtoupper($response->getXType()) == self::REQUEST_TYPE_AUTH_ONLY
             ) {
-                $order->getPayment()->setTransactionId(null)->setParentTransactionId($response->getXTransId())->void();
+                $order->getPayment()
+                      ->setTransactionId(null)
+                      ->setParentTransactionId($response->getXTransId())
+                      ->void($response);
             }
             $order->registerCancellation($message)->save();
         } catch (\Exception $e) {

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

@@ -65,7 +65,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();