Merge pull request #1404 from magento-engcom/develop-prs

Public Pull Requests

#10483

Author: Oleksii Korshenko

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

@@ -24,7 +24,7 @@ class Configurable extends Renderer implements IdentityInterface
     /**
      * Get item configurable child product
      *
-     * @return \Magento\Catalog\Model\Product
+     * @return \Magento\Catalog\Model\Product|null
      */
     public function getChildProduct()
     {
@@ -66,8 +66,9 @@ public function getProductForThumbnail()
         if ($this->_scopeConfig->getValue(
             self::CONFIG_THUMBNAIL_SOURCE,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ) == ThumbnailSource::OPTION_USE_PARENT_IMAGE ||
-            !($this->getChildProduct()->getThumbnail() && $this->getChildProduct()->getThumbnail() != 'no_selection')
+        ) == ThumbnailSource::OPTION_USE_PARENT_IMAGE
+          || !($this->getChildProduct()
+          && $this->getChildProduct()->getThumbnail() && $this->getChildProduct()->getThumbnail() != 'no_selection')
         ) {
             $product = $this->getProduct();
         } else {