Merge remote-tracking branch 'origin/MAGETWO-47017' into BUGS

Author: sevos1984

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

@@ -564,6 +564,9 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO
                 $this->resourceModel->getLinkField(),
                 $existingProduct->getData($this->resourceModel->getLinkField())
             );
+            if (!$product->hasData(Product::STATUS)) {
+                $product->setStatus($existingProduct->getStatus());
+            }
         } catch (NoSuchEntityException $e) {
             $existingProduct = null;
         }

app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml

@@ -193,6 +193,7 @@
                         <item name="add_variables" xsi:type="boolean">false</item>
                         <item name="add_widgets" xsi:type="boolean">false</item>
                         <item name="add_images" xsi:type="boolean">false</item>
+                        <item name="add_directives" xsi:type="boolean">true</item>
                     </item>
                     <item name="source" xsi:type="string">category</item>
                 </item>

app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php

@@ -65,11 +65,6 @@ class ConfigurableTest extends \PHPUnit_Framework_TestCase
      */
     private $storeManager;
 
-    /**
-     * @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $registry;
-
     protected function setUp()
     {
         $this->mockContextObject();
@@ -174,11 +169,6 @@ public function testGetJsonConfig()
             ->method('getId')
             ->willReturn($productId);
 
-        $this->registry->expects($this->any())
-            ->method('registry')
-            ->with('product')
-            ->willReturn($productMock);
-
         $this->helper->expects($this->any())
             ->method('getOptions')
             ->with($productMock, [$productMock])
@@ -217,6 +207,8 @@ public function testGetJsonConfig()
             ->with($expectedArray)
             ->willReturn($expectedJson);
 
+        $this->block->setData('product', $productMock);
+
         $result = $this->block->getJsonConfig();
         $this->assertEquals($expectedJson, $result);
     }
@@ -330,19 +322,12 @@ protected function mockContextObject()
         $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
             ->getMockForAbstractClass();
 
-        $this->registry = $this->getMockBuilder(\Magento\Framework\Registry::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $this->context = $this->getMockBuilder(\Magento\Catalog\Block\Product\Context::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->context->expects($this->any())
             ->method('getStoreManager')
             ->willReturn($this->storeManager);
-        $this->context->expects($this->any())
-            ->method('getRegistry')
-            ->willReturn($this->registry);
     }
 
     /**

app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php

@@ -10,7 +10,7 @@
 namespace Magento\Cron\Observer;
 
 use Magento\Framework\App\State;
-use Magento\Framework\Console\CLI;
+use Magento\Framework\Console\Cli;
 use Magento\Framework\Event\ObserverInterface;
 use \Magento\Cron\Model\Schedule;
 
@@ -188,7 +188,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                     ) == 1
                 )) {
                 $this->_shell->execute(
-                    $phpPath . ' %s cron:run --group=' . $groupId . ' --' . CLI::INPUT_KEY_BOOTSTRAP . '='
+                    $phpPath . ' %s cron:run --group=' . $groupId . ' --' . Cli::INPUT_KEY_BOOTSTRAP . '='
                     . self::STANDALONE_PROCESS_STARTED . '=1',
                     [
                         BP . '/bin/magento'

app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml

@@ -13,9 +13,7 @@
         <?php foreach ($crumbs as $crumbName => $crumbInfo) : ?>
             <li class="item <?php /* @escapeNotVerified */ echo $crumbName ?>">
             <?php if ($crumbInfo['link']) : ?>
-                <a href="<?php /* @escapeNotVerified */ echo $crumbInfo['link'] ?>" title="<?php echo $block->escapeHtml($crumbInfo['title']) ?>">
-                    <?php echo $block->escapeHtml($crumbInfo['label']) ?>
-                </a>
+                <a href="<?php /* @escapeNotVerified */ echo $crumbInfo['link'] ?>" title="<?php echo $block->escapeHtml($crumbInfo['title']) ?>"><?php echo $block->escapeHtml($crumbInfo['label']) ?></a>
             <?php elseif ($crumbInfo['last']) : ?>
                 <strong><?php echo $block->escapeHtml($crumbInfo['label']) ?></strong>
             <?php else: ?>

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php

@@ -1266,4 +1266,34 @@ public function testSpecialPrice()
         $this->assertEquals(0, count(array_intersect($attributeCodes, $missingAttributes)));
         $this->assertEquals(2, count(array_intersect($attributeCodes, $expectedAttribute)));
     }
+
+    public function testUpdateStatus()
+    {
+        // Create simple product
+        $productData = [
+            ProductInterface::SKU => "product_simple_502",
+            ProductInterface::NAME => "Product Simple 502",
+            ProductInterface::VISIBILITY => 4,
+            ProductInterface::TYPE_ID => 'simple',
+            ProductInterface::PRICE => 100,
+            ProductInterface::STATUS => 0,
+            ProductInterface::TYPE_ID => 'simple',
+            ProductInterface::ATTRIBUTE_SET_ID => 4,
+        ];
+
+        // Save product with status disabled
+        $this->saveProduct($productData);
+        $response = $this->getProduct($productData[ProductInterface::SKU]);
+        $this->assertEquals(0, $response['status']);
+
+        // Update the product
+        $productData[ProductInterface::PRICE] = 200;
+        $this->saveProduct($productData);
+        $response = $this->getProduct($productData[ProductInterface::SKU]);
+
+        // Status should still be disabled
+        $this->assertEquals(0, $response['status']);
+        // Price should be updated
+        $this->assertEquals(200, $response['price']);
+    }
 }

lib/internal/Magento/Framework/Exception/LocalizedException.php

@@ -26,15 +26,14 @@ class LocalizedException extends \Exception
     protected $logMessage;
 
     /**
-     * Constructor
-     *
      * @param \Magento\Framework\Phrase $phrase
      * @param \Exception $cause
+     * @param int $code
      */
-    public function __construct(Phrase $phrase, \Exception $cause = null)
+    public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0)
     {
         $this->phrase = $phrase;
-        parent::__construct($phrase->render(), 0, $cause);
+        parent::__construct($phrase->render(), intval($code), $cause);
     }
 
     /**

lib/internal/Magento/Framework/Exception/Test/Unit/LocalizedExceptionTest.php

@@ -150,4 +150,16 @@ public function testGetLogMessage()
         $expectedLogMessage = 'message parameter1 parameter2';
         $this->assertEquals($expectedLogMessage, $localizeException->getLogMessage());
     }
+
+    public function testGetCode()
+    {
+        $expectedCode = 42;
+        $localizedException = new LocalizedException(
+            new Phrase("message %1", ['test']),
+            new \Exception(),
+            $expectedCode
+        );
+
+        $this->assertEquals($expectedCode, $localizedException->getCode());
+    }
 }

setup/src/Magento/Setup/Model/UninstallCollector.php

@@ -56,7 +56,7 @@ public function collectUninstall($filterModules = [])
         $setup = $this->dataSetupFactory->create();
         $result = $setup->getConnection()->select()->from($setup->getTable('setup_module'), ['module']);
         if (isset($filterModules) && sizeof($filterModules) > 0) {
-            $result->where('module in( ? )', implode(',', $filterModules));
+            $result->where('module in( ? )', $filterModules);
         }
         // go through modules
         foreach ($setup->getConnection()->fetchAll($result) as $row) {