Merge pull request #847 from magento-tsg/2.0-develop-pr6

[TSG] Backporting for 2.0 (pr6)

Author: Volodymyr Klymenko

app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php

@@ -7,6 +7,13 @@
 
 class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction
 {
+    /**
+     * Whether to use main or temporary index table
+     *
+     * @var bool
+     */
+    protected $useTempTable = false;
+
     /**
      * Refresh entities index
      *

app/code/Magento/Catalog/Model/ResourceModel/MaxHeapTableSizeProcessor.php

@@ -7,6 +7,9 @@
 
 use Magento\Framework\App\ResourceConnection;
 
+/**
+ * @deprecated
+ */
 class MaxHeapTableSizeProcessor
 {
     /**

app/code/Magento/Catalog/Plugin/Model/Indexer/Category/Product/MaxHeapTableSizeProcessorOnFullReindex.php

@@ -10,6 +10,9 @@
 use Magento\Catalog\Model\ResourceModel\MaxHeapTableSizeProcessor;
 use Psr\Log\LoggerInterface;
 
+/**
+ * @deprecated
+ */
 class MaxHeapTableSizeProcessorOnFullReindex
 {
     /**

app/code/Magento/Catalog/etc/adminhtml/di.xml

@@ -62,7 +62,6 @@
     </type>
     <type name="Magento\Catalog\Model\Indexer\Category\Product\Action\Full">
         <plugin name="invalidate_pagecache_after_full_reindex" type="Magento\Catalog\Plugin\Model\Indexer\Category\Product\Execute" />
-        <plugin name="max_heap_tablse_size_processor_on_full_reindex" type="Magento\Catalog\Plugin\Model\Indexer\Category\Product\MaxHeapTableSizeProcessorOnFullReindex"/>
     </type>
     <type name="Magento\Catalog\Model\ResourceModel\Attribute">
         <plugin name="invalidate_pagecache_after_attribute_save" type="Magento\Catalog\Plugin\Model\ResourceModel\Attribute\Save" />

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml

@@ -53,7 +53,7 @@
     <div data-role="tabs" id="product-edit-form-tabs"></div> <?php /* @TODO: remove id after elimination of setDestElementId('product-edit-form-tabs') */?>
     <?php echo $block->getChildHtml('product-type-tabs') ?>
     <input type="hidden" id="product_type_id" value="<?php /* @escapeNotVerified */ echo $block->getProduct()->getTypeId()?>"/>
-    <input type="hidden" id="attribute_set_id" value="<?php /* @escapeNotVerified */ echo $block->getProduct()->getAttributeSetId()?>"/>
+    <input type="hidden" id="attribute_set_id" name="set" value="<?php /* @escapeNotVerified */ echo $block->getProduct()->getAttributeSetId()?>"/>
     <button type="submit" class="hidden"></button>
 <?php if ($block->getUseContainer()): ?>
 </form>

app/code/Magento/Catalog/view/adminhtml/web/js/options.js

@@ -58,6 +58,7 @@ define([
 
                     if (render) {
                         this.render();
+                        this.updateItemsCountField();
                     }
                 },
                 remove: function (event) {

app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php

@@ -207,8 +207,6 @@ protected function _renderFiltersBefore()
             []
         );
 
-        $this->_totalRecords = $this->queryResponse->count();
-
         if ($this->order && 'relevance' === $this->order['field']) {
             $this->getSelect()->order('search_result.'. TemporaryStorage::FIELD_SCORE . ' ' . $this->order['dir']);
         }

app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php

@@ -82,11 +82,16 @@ public function __construct(
     protected function _construct()
     {
         $widget = $this->registry->registry('current_widget_instance');
+        $widgetOptions = $this->getLayout()->getBlock('wysiwyg_widget.options');
+
         if ($widget) {
             $widgetParameters = $widget->getWidgetParameters();
-            if (isset($widgetParameters['conditions'])) {
-                $this->rule->loadPost($widgetParameters);
-            }
+        } elseif ($widgetOptions) {
+            $widgetParameters = $widgetOptions->getWidgetValues();
+        }
+
+        if (isset($widgetParameters['conditions'])) {
+            $this->rule->loadPost($widgetParameters);
         }
     }
 

app/code/Magento/CatalogWidget/Test/Unit/Controller/Adminhtml/Product/Widget/ConditionsTest.php

@@ -8,6 +8,9 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
+/**
+ * Test class for \Magento\CatalogWidget\Controller\Adminhtml\Product\Widget\Conditions
+ */
 class ConditionsTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -37,16 +40,16 @@ class ConditionsTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->rule = $this->getMock('Magento\CatalogWidget\Model\Rule', [], [], '', false);
-        $this->response = $this->getMockBuilder('\Magento\Framework\App\ResponseInterface')
+        $this->rule = $this->getMock(\Magento\CatalogWidget\Model\Rule::class, [], [], '', false);
+        $this->response = $this->getMockBuilder(\Magento\Framework\App\ResponseInterface::class)
             ->setMethods(['setBody', 'sendResponse'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->response->expects($this->once())->method('setBody')->will($this->returnSelf());
 
         $objectManagerHelper = new ObjectManagerHelper($this);
         $arguments = $objectManagerHelper->getConstructArguments(
-            'Magento\CatalogWidget\Controller\Adminhtml\Product\Widget\Conditions',
+            \Magento\CatalogWidget\Controller\Adminhtml\Product\Widget\Conditions::class,
             [
                 'rule' => $this->rule,
                 'response' => $this->response
@@ -56,7 +59,7 @@ protected function setUp()
 
         $this->objectManager = $arguments['context']->getObjectManager();
         $this->controller = $objectManagerHelper->getObject(
-            'Magento\CatalogWidget\Controller\Adminhtml\Product\Widget\Conditions',
+            \Magento\CatalogWidget\Controller\Adminhtml\Product\Widget\Conditions::class,
             $arguments
         );
     }
@@ -69,7 +72,7 @@ public function testExecute()
         $this->request->expects($this->at(2))->method('getParam')->with('form')
             ->will($this->returnValue('request_form_param_value'));
 
-        $condition = $this->getMockBuilder('Magento\CatalogWidget\Model\Rule\Condition\Product')
+        $condition = $this->getMockBuilder(\Magento\CatalogWidget\Model\Rule\Condition\Product::class)
             ->setMethods([
                 'setId',
                 'setType',
@@ -82,7 +85,7 @@ public function testExecute()
             ->getMock();
         $condition->expects($this->once())->method('setId')->with('1--1')->will($this->returnSelf());
         $condition->expects($this->once())->method('setType')
-            ->with('Magento\CatalogWidget\Model\Rule\Condition\Product')
+            ->with(\Magento\CatalogWidget\Model\Rule\Condition\Product::class)
             ->will($this->returnSelf());
         $condition->expects($this->once())->method('setRule')->with($this->rule)->will($this->returnSelf());
         $condition->expects($this->once())->method('setPrefix')->with('conditions')->will($this->returnSelf());

app/code/Magento/Checkout/Block/Cart/Sidebar.php

@@ -64,7 +64,8 @@ public function getConfig()
             'removeItemUrl' => $this->getRemoveItemUrl(),
             'imageTemplate' => $this->getImageHtmlTemplate(),
             'baseUrl' => $this->getBaseUrl(),
-            'minicartMaxItemsVisible' => $this->getMiniCartMaxItemsCount()
+            'minicartMaxItemsVisible' => $this->getMiniCartMaxItemsCount(),
+            'websiteId' => $this->_storeManager->getStore()->getWebsiteId()
         ];
     }