Merge pull request #573 from magento-goinc/pr-573

Bomko, Alex(abomko) · Bomko, Alex(abomko) · commit 52be797ccac1 · 2016-05-10T20:08:07.000+03:00
[SWAT] Bug fixes
diff --git a/app/code/Magento/Bundle/Model/LinkManagement.php b/app/code/Magento/Bundle/Model/LinkManagement.php
@@ -368,7 +368,7 @@ private function getOptions(\Magento\Catalog\Api\Data\ProductInterface $product)
             $product
         );
 
-        $options = $optionCollection->appendSelections($selectionCollection);
+        $options = $optionCollection->appendSelections($selectionCollection, true);
         return $options;
     }
 
diff --git a/app/code/Magento/Bundle/Model/Product/CopyConstructor/Bundle.php b/app/code/Magento/Bundle/Model/Product/CopyConstructor/Bundle.php
@@ -24,7 +24,7 @@ public function build(Product $product, Product $duplicate)
             return;
         }
 
-        $bundleOptions = $product->getExtensionAttributes()->getBundleProductOptions();
+        $bundleOptions = $product->getExtensionAttributes()->getBundleProductOptions() ?: [];
         $duplicatedBundleOptions = [];
         foreach ($bundleOptions as $key => $bundleOption) {
             $duplicatedBundleOptions[$key] = clone $bundleOption;
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -456,7 +456,6 @@ public function getSelectionsCollection($optionIds, $product)
             $selectionsCollection = $this->_bundleCollection->create()
                 ->addAttributeToSelect($this->_config->getProductAttributes())
                 ->addAttributeToSelect('tax_class_id')//used for calculation item taxes in Bundle with Dynamic Price
-                ->setFlag('require_stock_items', true)
                 ->setFlag('product_children', true)
                 ->setPositionOrder()
                 ->addStoreFilter($this->getStoreFilter($product))
@@ -806,7 +805,6 @@ public function getSelectionsByIds($selectionIds, $product)
             $usedSelections = $this->_bundleCollection
                 ->create()
                 ->addAttributeToSelect('*')
-                ->setFlag('require_stock_items', true)
                 ->setFlag('product_children', true)
                 ->addStoreFilter($this->getStoreFilter($product))
                 ->setStoreId($storeId)
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php b/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
@@ -1048,7 +1048,7 @@ public function getRemoveOptions()
             ->will($this->returnValue([]));
 
         $this->optionCollection->expects($this->any())->method('appendSelections')
-            ->with($this->equalTo([]))
+            ->with($this->equalTo([]), true)
             ->will($this->returnValue([$this->option]));
     }
 }
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/CopyConstructor/BundleTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/CopyConstructor/BundleTest.php
@@ -89,4 +89,46 @@ public function testBuildPositive()
 
         $this->model->build($product, $duplicate);
     }
+
+    /**
+     * @return void
+     */
+    public function testBuildWithoutOptions()
+    {
+        $product = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $extensionAttributesProduct = $this->getMockBuilder(ProductExtensionInterface::class)
+            ->setMethods(['getBundleProductOptions'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $product->expects($this->once())
+            ->method('getTypeId')
+            ->willReturn(Type::TYPE_BUNDLE);
+        $product->expects($this->once())
+            ->method('getExtensionAttributes')
+            ->willReturn($extensionAttributesProduct);
+
+        $extensionAttributesProduct->expects($this->once())
+            ->method('getBundleProductOptions')
+            ->willReturn(null);
+
+        $duplicate = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $extensionAttributesDuplicate = $this->getMockBuilder(ProductExtensionInterface::class)
+            ->setMethods(['setBundleProductOptions'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $duplicate->expects($this->once())
+            ->method('getExtensionAttributes')
+            ->willReturn($extensionAttributesDuplicate);
+        $extensionAttributesDuplicate->expects($this->once())
+            ->method('setBundleProductOptions')
+            ->with([]);
+
+        $this->model->build($product, $duplicate);
+    }
 }
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
@@ -1956,7 +1956,6 @@ public function testGetSelectionsByIds()
             ->with('*')
             ->will($this->returnSelf());
         $flagMap = [
-            ['require_stock_items', true, $usedSelectionsMock],
             ['product_children', true, $usedSelectionsMock],
         ];
         $usedSelectionsMock->expects($this->any())
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php
@@ -14,6 +14,7 @@ class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var Initialization\StockDataFilter
+     * @deprecated
      */
     protected $stockFilter;
 
@@ -27,11 +28,6 @@ class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product
      */
     protected $resultForwardFactory;
 
-    /**
-     * @var Initialization\Helper
-     */
-    protected $initializationHelper;
-
     /**
      * @param Action\Context $context
      * @param Builder $productBuilder
@@ -64,20 +60,6 @@ public function execute()
         }
 
         $product = $this->productBuilder->build($this->getRequest());
-
-        $productData = $this->getRequest()->getPost('product');
-        if (!$productData) {
-            $sessionData = $this->_session->getProductData(true);
-            if (!empty($sessionData['product'])) {
-                $productData = $sessionData['product'];
-            }
-        }
-        if ($productData) {
-            $stockData = isset($productData['stock_data']) ? $productData['stock_data'] : [];
-            $productData['stock_data'] = $this->stockFilter->filter($stockData);
-            $product = $this->getInitializationHelper()->initializeFromData($product, $productData);
-        }
-
         $this->_eventManager->dispatch('catalog_product_new_action', ['product' => $product]);
 
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
@@ -98,16 +80,4 @@ public function execute()
 
         return $resultPage;
     }
-
-    /**
-     * @return Initialization\Helper
-     * @deprecated
-     */
-    protected function getInitializationHelper()
-    {
-        if (null === $this->initializationHelper) {
-            $this->initializationHelper = ObjectManager::getInstance()->get(Initialization\Helper::class);
-        }
-        return $this->initializationHelper;
-    }
 }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
@@ -141,13 +141,11 @@ public function execute()
                 }
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addError($e->getMessage());
-                $this->_session->setProductData($data);
                 $this->getDataPersistor()->set('catalog_product', $data);
                 $redirectBack = $productId ? true : 'new';
             } catch (\Exception $e) {
                 $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
                 $this->messageManager->addError($e->getMessage());
-                $this->_session->setProductData($data);
                 $this->getDataPersistor()->set('catalog_product', $data);
                 $redirectBack = $productId ? true : 'new';
             }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/NewActionTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/NewActionTest.php
@@ -70,19 +70,14 @@ protected function setUp()
         $resultForwardFactory->expects($this->any())
             ->method('create')
             ->willReturn($this->resultForward);
-        $this->initializationHelper = $this->getMock(Helper::class, [], [], '', false);
-        $stockDataFilter = $this->getMockBuilder(StockDataFilter::class)
-            ->disableOriginalConstructor()->getMock();
 
         $this->action = (new ObjectManager($this))->getObject(
             NewAction::class,
             [
                 'context' => $this->initContext(),
                 'productBuilder' => $this->productBuilder,
-                'stockFilter' => $stockDataFilter,
                 'resultPageFactory' => $resultPageFactory,
                 'resultForwardFactory' => $resultForwardFactory,
-                'initializationHelper' => $this->initializationHelper,
             ]
         );
 
@@ -98,23 +93,4 @@ public function testExecute()
             ->willReturn('catalog_product_new');
         $this->action->execute();
     }
-
-    public function testExecuteObtainsProductDataFromSession()
-    {
-        $this->action->getRequest()->expects($this->any())->method('getParam')->willReturn(true);
-        $this->action->getRequest()->expects($this->any())->method('getFullActionName')
-            ->willReturn('catalog_product_new');
-
-        $productData = ['name' => 'test-name', 'stock_data' => null];
-        $this->session->expects($this->any())->method('getProductData')
-            ->willReturn(['product' => $productData]);
-
-        $this->initializationHelper
-            ->expects($this->once())
-            ->method('initializeFromData')
-            ->with($this->product, $productData)
-            ->willReturn($this->product);
-
-        $this->action->execute();
-    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/SaveTest.php
@@ -140,7 +140,6 @@ public function testExecuteSetsProductDataToSessionAndRedirectsToNewActionOnErro
             ->willReturn($this->product);
         $this->product->expects($this->any())->method('getSku')->willThrowException(new $exceptionType(__('message')));
 
-        $this->session->expects($this->once())->method('setProductData')->with($productData);
         $this->resultRedirect->expects($this->once())->method('setPath')->with('catalog/*/new');
 
         $this->action->execute();
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -373,6 +373,7 @@ public function modifyData(array $data)
     private function resolvePersistentData(array $data)
     {
         $persistentData = (array)$this->dataPersistor->get('catalog_product');
+        $this->dataPersistor->clear('catalog_product');
         $productId = $this->locator->getProduct()->getId();
 
         if (empty($data[$productId][self::DATA_SOURCE_DEFAULT])) {
diff --git a/app/code/Magento/CatalogInventory/Helper/Stock.php b/app/code/Magento/CatalogInventory/Helper/Stock.php
@@ -93,6 +93,7 @@ public function assignStatusToProduct(Product $product, $status = null)
      * Add stock status information to products
      *
      * @param AbstractCollection $productCollection
+     * @deprecated Use Stock::addIsInStockFilterToCollection instead
      * @return void
      */
     public function addStockStatusToProducts(AbstractCollection $productCollection)
diff --git a/app/code/Magento/ConfigurableProduct/Api/LinkManagementInterface.php b/app/code/Magento/ConfigurableProduct/Api/LinkManagementInterface.php
@@ -14,7 +14,7 @@
 interface LinkManagementInterface
 {
     /**
-     * Get all children for Bundle product
+     * Get all children for Configurable product
      *
      * @param string $sku
      * @return \Magento\Catalog\Api\Data\ProductInterface[]
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -512,6 +512,7 @@ public function getUsedProducts($product, $requiredAttributeIds = null)
         if (!$product->hasData($this->_usedProducts)) {
             $usedProducts = [];
             $collection = $this->getUsedProductCollection($product)
+                ->setFlag('has_stock_status_filter', true)
                 ->addAttributeToSelect('name')
                 ->addAttributeToSelect('price')
                 ->addAttributeToSelect('weight')
@@ -566,9 +567,6 @@ protected function getGalleryReadHandler()
     public function getUsedProductCollection($product)
     {
         $collection = $this->_productCollectionFactory->create()->setFlag(
-            'require_stock_items',
-            true
-        )->setFlag(
             'product_children',
             true
         )->setProductFilter(
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php
@@ -50,7 +50,7 @@ public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $produ
         }
         if ($price === null) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('Configurable product "%1" does not have sub-products', $product->getName())
+                __('Configurable product "%1" does not have sub-products', $product->getSku())
             );
         }
         return (float)$price;
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/ConfigurablePriceResolverTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/ConfigurablePriceResolverTest.php
@@ -56,9 +56,9 @@ public function testResolvePriceWithNoPrices()
             false,
             true,
             true,
-            ['getName']
+            ['getSku']
         );
-        $product->expects($this->once())->method('getName')->willReturn('Kiwi');
+        $product->expects($this->once())->method('getSku')->willReturn('Kiwi');
 
         $this->configurable->expects($this->once())->method('getUsedProducts')->willReturn([]);
 
@@ -81,9 +81,9 @@ public function testResolvePrice($expectedValue)
             false,
             true,
             true,
-            ['getName']
+            ['getSku']
         );
-        $product->expects($this->never())->method('getName');
+        $product->expects($this->never())->method('getSku');
 
         $this->configurable->expects($this->once())->method('getUsedProducts')->willReturn([$product]);
         $this->priceResolver->expects($this->atLeastOnce())->method('resolvePrice')->willReturn($price);
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
@@ -308,9 +308,6 @@ public function getAssociatedProductCollection($product)
         $links = $product->getLinkInstance();
         $links->setLinkTypeId(\Magento\GroupedProduct\Model\ResourceModel\Product\Link::LINK_TYPE_GROUPED);
         $collection = $links->getProductCollection()->setFlag(
-            'require_stock_items',
-            true
-        )->setFlag(
             'product_children',
             true
         )->setIsStrongMode();
diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
@@ -35,6 +35,7 @@ class SampleDataDeployCommand extends Command
 
     /**
      * @var ArrayInputFactory
+     * @deprecated
      */
     private $arrayInputFactory;
 
@@ -88,8 +89,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
             $commonArgs = array_merge(['packages' => $packages], $commonArgs);
             $arguments = array_merge(['command' => 'require'], $commonArgs);
-            /** @var ArrayInput $commandInput */
-            $commandInput = $this->arrayInputFactory->create(['parameters' => $arguments]);
+            $commandInput = new ArrayInput($arguments);
 
             /** @var Application $application */
             $application = $this->applicationFactory->create();
diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataRemoveCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataRemoveCommand.php
@@ -34,6 +34,7 @@ class SampleDataRemoveCommand extends Command
 
     /**
      * @var ArrayInputFactory
+     * @deprecated
      */
     private $arrayInputFactory;
 
@@ -82,8 +83,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $commonArgs = ['--working-dir' => $baseDir, '--no-interaction' => 1, '--no-progress' => 1];
             $packages = array_keys($sampleDataPackages);
             $arguments = array_merge(['command' => 'remove', 'packages' => $packages], $commonArgs);
-            /** @var ArrayInput $commandInput */
-            $commandInput = $this->arrayInputFactory->create(['parameters' => $arguments]);
+            $commandInput = new ArrayInput($arguments);
 
             /** @var Application $application */
             $application = $this->applicationFactory->create();
diff --git a/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php b/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php
@@ -34,10 +34,9 @@ public function testExecute(array $sampleDataPackages, $appRunResult, $expectedM
             ->method('getSampleDataPackages')
             ->willReturn($sampleDataPackages);
 
-        $commandInput = $this->getMock('Symfony\Component\Console\Input\ArrayInput', [], [], '', false);
-
         $arrayInputFactory = $this
             ->getMock('Symfony\Component\Console\Input\ArrayInputFactory', ['create'], [], '', false);
+        $arrayInputFactory->expects($this->never())->method('create');
 
         array_walk($sampleDataPackages, function (&$v, $k) {
             $v = "$k:$v";
@@ -51,10 +50,7 @@ public function testExecute(array $sampleDataPackages, $appRunResult, $expectedM
             '--no-progress' => 1,
             'packages'      => $packages,
         ];
-        $arrayInputFactory->expects($this->any())
-            ->method('create')
-            ->with(['parameters' => $requireArgs])
-            ->willReturn($commandInput);
+        $commandInput = new \Symfony\Component\Console\Input\ArrayInput($requireArgs);
 
         $application = $this->getMock('Composer\Console\Application', [], [], '', false);
         $application->expects($this->any())->method('run')

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ private function getOptions(\Magento\Catalog\Api\Data\ProductInterface $product)`
`368`	`368`	`$product`
`369`	`369`	`);`
`370`	`370`
`371`		`- $options = $optionCollection->appendSelections($selectionCollection);`
	`371`	`+ $options = $optionCollection->appendSelections($selectionCollection, true);`
`372`	`372`	`return $options;`
`373`	`373`	`}`
`374`	`374`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function build(Product $product, Product $duplicate)`
`24`	`24`	`return;`
`25`	`25`	`}`
`26`	`26`
`27`		`- $bundleOptions = $product->getExtensionAttributes()->getBundleProductOptions();`
	`27`	`+ $bundleOptions = $product->getExtensionAttributes()->getBundleProductOptions() ?: [];`
`28`	`28`	`$duplicatedBundleOptions = [];`
`29`	`29`	`foreach ($bundleOptions as $key => $bundleOption) {`
`30`	`30`	`$duplicatedBundleOptions[$key] = clone $bundleOption;`
Original file line number	Diff line number	Diff line change
`@@ -1048,7 +1048,7 @@ public function getRemoveOptions()`
`1048`	`1048`	`->will($this->returnValue([]));`
`1049`	`1049`
`1050`	`1050`	`$this->optionCollection->expects($this->any())->method('appendSelections')`
`1051`		`- ->with($this->equalTo([]))`
	`1051`	`+ ->with($this->equalTo([]), true)`
`1052`	`1052`	`->will($this->returnValue([$this->option]));`
`1053`	`1053`	`}`
`1054`	`1054`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,13 +141,11 @@ public function execute()`
`141`	`141`	`}`
`142`	`142`	`} catch (\Magento\Framework\Exception\LocalizedException $e) {`
`143`	`143`	`$this->messageManager->addError($e->getMessage());`
`144`		`- $this->_session->setProductData($data);`
`145`	`144`	`$this->getDataPersistor()->set('catalog_product', $data);`
`146`	`145`	`$redirectBack = $productId ? true : 'new';`
`147`	`146`	`} catch (\Exception $e) {`
`148`	`147`	`$this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);`
`149`	`148`	`$this->messageManager->addError($e->getMessage());`
`150`		`- $this->_session->setProductData($data);`
`151`	`149`	`$this->getDataPersistor()->set('catalog_product', $data);`
`152`	`150`	`$redirectBack = $productId ? true : 'new';`
`153`	`151`	`}`