MAGETWO-69692: Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-69692-PR-9813

Author: ishakhsuvarov

.gitignore

@@ -48,6 +48,7 @@ atlassian*
 /pub/media/favicon/*
 /pub/media/import/*
 !/pub/media/import/.htaccess
+/pub/media/logo/*
 /pub/media/theme/*
 /pub/media/theme_customization/*
 !/pub/media/theme_customization/.htaccess

app/autoload.php

@@ -35,6 +35,3 @@
 }
 
 AutoloaderRegistry::registerAutoloader(new ClassLoaderWrapper($composerAutoloader));
-
-// Sets default autoload mappings, may be overridden in Bootstrap::create
-\Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);

app/bootstrap.php

@@ -28,6 +28,9 @@
 }
 
 require_once __DIR__ . '/autoload.php';
+// Sets default autoload mappings, may be overridden in Bootstrap::create
+\Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);
+
 require_once BP . '/app/functions.php';
 
 /* Custom umask value may be provided in optional mage_umask file in root */

app/code/Magento/Bundle/Model/Product/Price.php

@@ -3,16 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Bundle\Model\Product;
 
 use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
 
 /**
- * Bundle Price Model
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Price extends \Magento\Catalog\Model\Product\Type\Price
 {
@@ -48,7 +48,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
     private $serializer;
 
     /**
-     * Price constructor.
+     * Constructor
      *
      * @param \Magento\CatalogRule\Model\ResourceModel\RuleFactory $ruleFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -61,6 +61,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @param ProductTierPriceExtensionFactory|null $tierPriceExtensionFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -74,10 +75,11 @@ public function __construct(
         \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
         \Magento\Catalog\Helper\Data $catalogData,
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
+        ProductTierPriceExtensionFactory $tierPriceExtensionFactory = null
     ) {
         $this->_catalogData = $catalogData;
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+        $this->serializer = $serializer ?: ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
         parent::__construct(
             $ruleFactory,
@@ -88,7 +90,8 @@ public function __construct(
             $priceCurrency,
             $groupManagement,
             $tierPriceFactory,
-            $config
+            $config,
+            $tierPriceExtensionFactory
         );
     }
 

app/code/Magento/Bundle/Test/Unit/Model/Product/PriceTest.php

@@ -6,10 +6,9 @@
 namespace Magento\Bundle\Test\Unit\Model\Product;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
 
 /**
- * Test for Model ProductPrice.
- *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PriceTest extends \PHPUnit_Framework_TestCase
@@ -114,7 +113,10 @@ function ($value) {
                     return json_decode($value, true);
                 }
             );
-
+        $tierPriceExtensionFactoryMock = $this->getMockBuilder(ProductTierPriceExtensionFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->model = $objectManagerHelper->getObject(
             \Magento\Bundle\Model\Product\Price::class,
@@ -129,7 +131,8 @@ function ($value) {
                 'tierPriceFactory' => $tpFactory,
                 'config' => $scopeConfig,
                 'catalogData' => $this->catalogHelperMock,
-                'serializer' => $this->serializer
+                'serializer' => $this->serializer,
+                'tierPriceExtensionFactory' => $tierPriceExtensionFactoryMock
             ]
         );
     }

app/code/Magento/Catalog/Block/Product/ProductList/Related.php

@@ -116,6 +116,13 @@ protected function _beforeToHtml()
      */
     public function getItems()
     {
+        /**
+         * getIdentities() depends on _itemCollection populated, but it can be empty if the block is hidden
+         * @see https://github.com/magento/magento2/issues/5897
+         */
+        if (is_null($this->_itemCollection)) {
+            $this->_prepareData();
+        }
         return $this->_itemCollection;
     }
 

app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php

@@ -135,6 +135,13 @@ protected function _beforeToHtml()
      */
     public function getItemCollection()
     {
+        /**
+         * getIdentities() depends on _itemCollection populated, but it can be empty if the block is hidden
+         * @see https://github.com/magento/magento2/issues/5897
+         */
+        if (is_null($this->_itemCollection)) {
+            $this->_prepareData();
+        }
         return $this->_itemCollection;
     }
 

app/code/Magento/Catalog/Block/Product/View/Gallery.php

@@ -122,9 +122,9 @@ public function getGalleryImagesJson()
         }
         if (empty($imagesItems)) {
             $imagesItems[] = [
-                'thumb' => $this->getImage($this->getProduct(), 'product_thumbnail_image')->getImageUrl(),
-                'img' => $this->getImage($this->getProduct(), 'product_base_image')->getImageUrl(),
-                'full' => $this->getImage($this->getProduct(), 'product_page_image_large')->getImageUrl(),
+                'thumb' => $this->_imageHelper->getDefaultPlaceholderUrl('thumbnail'),
+                'img' => $this->_imageHelper->getDefaultPlaceholderUrl('image'),
+                'full' => $this->_imageHelper->getDefaultPlaceholderUrl('image'),
                 'caption' => '',
                 'position' => '0',
                 'isMain' => true,

app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -73,18 +72,24 @@ class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Produ
     protected $extensionAttributesFactory;
 
     /**
+     * Constructor
+     *
      * @param \Magento\Backend\App\Action\Context $context
      * @param Builder $productBuilder
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param \Magento\Eav\Api\Data\AttributeGroupInterfaceFactory|null $attributeGroupFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder,
-        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
+        \Magento\Eav\Api\Data\AttributeGroupInterfaceFactory $attributeGroupFactory = null
     ) {
         parent::__construct($context, $productBuilder);
         $this->resultJsonFactory = $resultJsonFactory;
+        $this->attributeGroupFactory = $attributeGroupFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Eav\Api\Data\AttributeGroupInterfaceFactory::class);
     }
 
     /**
@@ -125,7 +130,7 @@ public function execute()
                 $attributeGroup = reset($attributeGroupItems);
             } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
                 /** @var AttributeGroupInterface $attributeGroup */
-                $attributeGroup = $this->getAttributeGroupFactory()->create();
+                $attributeGroup = $this->attributeGroupFactory->create();
             }
 
             $extensionAttributes = $attributeGroup->getExtensionAttributes()
@@ -221,18 +226,6 @@ private function getAttributeGroupRepository()
         return $this->attributeGroupRepository;
     }
 
-    /**
-     * @return AttributeGroupInterfaceFactory
-     */
-    private function getAttributeGroupFactory()
-    {
-        if (null === $this->attributeGroupFactory) {
-            $this->attributeGroupFactory = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Eav\Api\Data\AttributeGroupInterfaceFactory::class);
-        }
-        return $this->attributeGroupFactory;
-    }
-
     /**
      * @return SearchCriteriaBuilder
      */

app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -41,21 +40,27 @@ class Builder
     protected $storeFactory;
 
     /**
+     * Constructor
+     *
      * @param ProductFactory $productFactory
      * @param Logger $logger
      * @param Registry $registry
      * @param WysiwygModel\Config $wysiwygConfig
+     * @param StoreFactory|null $storeFactory
      */
     public function __construct(
         ProductFactory $productFactory,
         Logger $logger,
         Registry $registry,
-        WysiwygModel\Config $wysiwygConfig
+        WysiwygModel\Config $wysiwygConfig,
+        StoreFactory $storeFactory = null
     ) {
         $this->productFactory = $productFactory;
         $this->logger = $logger;
         $this->registry = $registry;
         $this->wysiwygConfig = $wysiwygConfig;
+        $this->storeFactory = $storeFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Store\Model\StoreFactory::class);
     }
 
     /**
@@ -70,7 +75,7 @@ public function build(RequestInterface $request)
         /** @var $product \Magento\Catalog\Model\Product */
         $product = $this->productFactory->create();
         $product->setStoreId($request->getParam('store', 0));
-        $store = $this->getStoreFactory()->create();
+        $store = $this->storeFactory->create();
         $store->load($request->getParam('store', 0));
 
         $typeId = $request->getParam('type');
@@ -99,16 +104,4 @@ public function build(RequestInterface $request)
         $this->wysiwygConfig->setStoreId($request->getParam('store'));
         return $product;
     }
-
-    /**
-     * @return StoreFactory
-     */
-    private function getStoreFactory()
-    {
-        if (null === $this->storeFactory) {
-            $this->storeFactory = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Store\Model\StoreFactory::class);
-        }
-        return $this->storeFactory;
-    }
 }