Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-64085

Author: cpartica

app/code/Magento/Backend/Block/Template.php

@@ -85,12 +85,22 @@ public function getFormKey()
      *
      * @param string $moduleName Full module name
      * @return boolean
-     * @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
+     * version. Module output can still be enabled/disabled in configuration files. However, this functionality should
+     * not be used in future development. Module design should explicitly state dependencies to avoid requiring output
+     * disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
+     * issues that will be addressed in future releases.
      */
     public function isOutputEnabled($moduleName = null)
     {
-        return true;
+        if ($moduleName === null) {
+            $moduleName = $this->getModuleName();
+        }
+
+        return !$this->_scopeConfig->isSetFlag(
+            'advanced/modules_disable_output/' . $moduleName,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
     }
 
     /**

app/code/Magento/Bundle/etc/di.xml

@@ -160,6 +160,9 @@
             <argument name="estimators" xsi:type="array">
                 <item name="bundle" xsi:type="object">Magento\Catalog\Model\Indexer\Price\CompositeProductBatchSizeManagement</item>
             </argument>
+            <argument name="batchSizeAdjusters" xsi:type="array">
+                <item name="bundle" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\CompositeProductBatchSizeAdjuster</item>
+            </argument>
         </arguments>
     </type>
     <type name="Magento\Bundle\Model\ResourceModel\Indexer\Price">

app/code/Magento/Bundle/view/adminhtml/web/js/bundle-type-handler.js

@@ -2,7 +2,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-/*jshint browser:true jquery:true expr:true*/
+
 define([
     'jquery',
     'Magento_Catalog/catalog/type-events',

app/code/Magento/Bundle/view/frontend/web/js/float.js

@@ -5,6 +5,7 @@
 
 /**
  * @api
+ * @deprecated since version 2.2.0
  */
 define([
     'jquery',

app/code/Magento/Captcha/view/frontend/web/onepage.js

@@ -3,6 +3,9 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @deprecated since version 2.2.0
+ */
 define(['jquery'], function ($) {
     'use strict';
 

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

@@ -106,6 +106,9 @@ public function execute($ids = null)
                 $this->_defaultIndexerResource->getMainTable()
             );
 
+            // Prepare replica table for indexation.
+            $this->_defaultIndexerResource->getConnection()->truncateTable($replicaTable);
+
             /** @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\AbstractIndexer $indexer */
             foreach ($this->getTypeIndexers() as $indexer) {
                 $indexer->getTableStrategy()->setUseIdxTable(false);

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/BatchSizeCalculator.php

@@ -21,15 +21,24 @@ class BatchSizeCalculator
      */
     private $estimators;
 
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\CompositeProductBatchSizeAdjusterInterface[]
+     * @since 2.2.0
+     */
+    private $batchSizeAdjusters;
+
     /**
      * BatchSizeCalculator constructor.
      * @param array $batchRowsCount
      * @param array $estimators
+     * @param array $batchSizeAdjusters
+     * @since 2.2.0
      */
-    public function __construct(array $batchRowsCount, array $estimators)
+    public function __construct(array $batchRowsCount, array $estimators, array $batchSizeAdjusters)
     {
         $this->batchRowsCount = $batchRowsCount;
         $this->estimators = $estimators;
+        $this->batchSizeAdjusters = $batchSizeAdjusters;
     }
 
     /**
@@ -52,6 +61,10 @@ public function estimateBatchSize(\Magento\Framework\DB\Adapter\AdapterInterface
             ? $this->estimators[$indexerTypeId]
             : $this->estimators['default'];
 
+        $batchRowsCount = isset($this->batchSizeAdjusters[$indexerTypeId])
+            ? $this->batchSizeAdjusters[$indexerTypeId]->adjust($batchRowsCount)
+            : $batchRowsCount;
+
         $calculator->ensureBatchSize($connection, $batchRowsCount);
 
         return $batchRowsCount;

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductBatchSizeAdjuster.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Price;
+
+/**
+ * Correct batch size according to number of composite related items.
+ */
+class CompositeProductBatchSizeAdjuster implements CompositeProductBatchSizeAdjusterInterface
+{
+    /**
+     * @var CompositeProductRelationsCalculator
+     */
+    private $compositeProductRelationsCalculator;
+
+    /**
+     * @param CompositeProductRelationsCalculator $compositeProductRelationsCalculator
+     */
+    public function __construct(CompositeProductRelationsCalculator $compositeProductRelationsCalculator)
+    {
+        $this->compositeProductRelationsCalculator = $compositeProductRelationsCalculator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function adjust($batchSize)
+    {
+        $maxRelationsCount = $this->compositeProductRelationsCalculator->getMaxRelationsCount();
+        return $maxRelationsCount > 0 ? ceil($batchSize / $maxRelationsCount) : $batchSize;
+    }
+}

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductBatchSizeAdjusterInterface.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Price;
+
+/**
+ * Correct batch size according to number of composite related items.
+ * @api
+ */
+interface CompositeProductBatchSizeAdjusterInterface
+{
+    /**
+     * Correct batch size according to number of composite related items.
+     *
+     * @param int $batchSize
+     * @return int
+     */
+    public function adjust($batchSize);
+}

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRelationsCalculator.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Price;
+
+/**
+ * Class calculates composite product relations.
+ */
+class CompositeProductRelationsCalculator
+{
+    /**
+     * @param DefaultPrice $indexerResource
+     */
+    public function __construct(DefaultPrice $indexerResource)
+    {
+        $this->indexerResource = $indexerResource;
+    }
+
+    /**
+     * Returns maximum number of composite related products.
+     *
+     * @return int
+     */
+    public function getMaxRelationsCount()
+    {
+        $connection = $this->indexerResource->getConnection();
+        $relationSelect = $connection->select();
+        $relationSelect->from(
+            ['relation' => $this->indexerResource->getTable('catalog_product_relation')],
+            ['count' => new \Zend_Db_Expr('count(relation.child_id)')]
+        );
+        $relationSelect->group('parent_id');
+
+        $maxSelect = $connection->select();
+        $maxSelect->from(
+            ['max_value' => $relationSelect],
+            ['count' => new \Zend_Db_Expr('MAX(count)')]
+        );
+        return $connection->fetchOne($maxSelect);
+    }
+}