merge magento/2.3-develop into magento-chaika/Chaika-PR-2019-09-03-2.3

Author: magento-cicd2

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

@@ -832,12 +832,14 @@ public function getStoreIds()
         if (!$this->hasStoreIds()) {
             $storeIds = [];
             if ($websiteIds = $this->getWebsiteIds()) {
-                if ($this->_storeManager->isSingleStoreMode()) {
+                if (!$this->isObjectNew() && $this->_storeManager->isSingleStoreMode()) {
                     $websiteIds = array_keys($websiteIds);
                 }
                 foreach ($websiteIds as $websiteId) {
                     $websiteStores = $this->_storeManager->getWebsite($websiteId)->getStoreIds();
-                    $storeIds = array_merge($storeIds, $websiteStores);
+                    foreach ($websiteStores as $websiteStore) {
+                        $storeIds []= $websiteStore;
+                    }
                 }
             }
             $this->setStoreIds($storeIds);
@@ -920,9 +922,9 @@ public function beforeSave()
         //Validate changing of design.
         $userType = $this->getUserContext()->getUserType();
         if ((
-                $userType === UserContextInterface::USER_TYPE_ADMIN
+            $userType === UserContextInterface::USER_TYPE_ADMIN
                 || $userType === UserContextInterface::USER_TYPE_INTEGRATION
-            )
+        )
             && !$this->getAuthorization()->isAllowed('Magento_Catalog::edit_product_design')
         ) {
             $this->setData('custom_design', $this->getOrigData('custom_design'));

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

@@ -13,6 +13,7 @@
 use Magento\Framework\Api\ExtensibleDataInterface;
 use Magento\Framework\Api\ExtensionAttributesFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Product Test
@@ -207,6 +208,11 @@ class ProductTest extends \PHPUnit\Framework\TestCase
      */
     private $eavConfig;
 
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -303,13 +309,13 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $storeManager->expects($this->any())
+        $this->storeManager->expects($this->any())
             ->method('getStore')
             ->will($this->returnValue($this->store));
-        $storeManager->expects($this->any())
+        $this->storeManager->expects($this->any())
             ->method('getWebsite')
             ->will($this->returnValue($this->website));
         $this->indexerRegistryMock = $this->createPartialMock(
@@ -394,7 +400,7 @@ protected function setUp()
                 'extensionFactory' => $this->extensionAttributesFactory,
                 'productPriceIndexerProcessor' => $this->productPriceProcessor,
                 'catalogProductOptionFactory' => $optionFactory,
-                'storeManager' => $storeManager,
+                'storeManager' => $this->storeManager,
                 'resource' => $this->resource,
                 'registry' => $this->registry,
                 'moduleManager' => $this->moduleManager,
@@ -450,6 +456,48 @@ public function testGetStoreIds()
         $this->assertEquals($expectedStoreIds, $this->model->getStoreIds());
     }
 
+    /**
+     * @dataProvider getSingleStoreIds
+     * @param bool $isObjectNew
+     */
+    public function testGetStoreSingleSiteModelIds(
+        bool $isObjectNew
+    ) {
+        $websiteIDs = [0 => 2];
+        $this->model->setWebsiteIds(
+            !$isObjectNew ? $websiteIDs : array_flip($websiteIDs)
+        );
+
+        $this->model->isObjectNew($isObjectNew);
+
+        $this->storeManager->expects(
+            $this->exactly(
+                (int) !$isObjectNew
+            )
+        )
+            ->method('isSingleStoreMode')
+            ->will($this->returnValue(true));
+
+        $this->website->expects(
+            $this->once()
+        )->method('getStoreIds')
+            ->will($this->returnValue($websiteIDs));
+
+        $this->assertEquals($websiteIDs, $this->model->getStoreIds());
+    }
+
+    public function getSingleStoreIds()
+    {
+        return [
+          [
+              false
+          ],
+          [
+              true
+          ],
+        ];
+    }
+
     public function testGetStoreId()
     {
         $this->model->setStoreId(3);
@@ -1221,8 +1269,7 @@ public function testGetMediaGalleryImagesMerging()
     {
         $mediaEntries =
             [
-            'images' =>
-                [
+            'images' => [
                 [
                     'value_id' => 1,
                     'file' => 'imageFile.jpg',