Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-91545

# Conflicts:
#	dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml

Author: dthampy

app/code/Magento/Bundle/composer.json

@@ -25,7 +25,8 @@
     },
     "suggest": {
         "magento/module-webapi": "*",
-        "magento/module-bundle-sample-data": "*"
+        "magento/module-bundle-sample-data": "*",
+        "magento/module-sales-rule": "*"
     },
     "type": "magento2-module",
     "license": [

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

@@ -207,4 +207,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\SalesRule\Model\Quote\ChildrenValidationLocator">
+        <arguments>
+            <argument name="productTypeChildrenValidationMap" xsi:type="array">
+                <item name="bundle" xsi:type="boolean">false</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php

@@ -69,6 +69,7 @@ class Save extends Attribute
      * @var LayoutFactory
      */
     private $layoutFactory;
+
     /**
      * @var Presentation
      */
@@ -124,6 +125,7 @@ public function execute()
     {
         $data = $this->getRequest()->getPostValue();
         if ($data) {
+            $this->preprocessOptionsData($data);
             $setId = $this->getRequest()->getParam('set');
 
             $attributeSet = null;
@@ -313,6 +315,28 @@ public function execute()
         return $this->returnResult('catalog/*/', [], ['error' => true]);
     }
 
+    /**
+     * Extract options data from serialized options field and append to data array.
+     *
+     * This logic is required to overcome max_input_vars php limit
+     * that may vary and/or be inaccessible to change on different instances.
+     *
+     * @param array $data
+     * @return void
+     */
+    private function preprocessOptionsData(&$data)
+    {
+        if (isset($data['serialized_options'])) {
+            $serializedOptions = json_decode($data['serialized_options'], JSON_OBJECT_AS_ARRAY);
+            foreach ($serializedOptions as $serializedOption) {
+                $option = [];
+                parse_str($serializedOption, $option);
+                $data = array_replace_recursive($data, $option);
+            }
+        }
+        unset($data['serialized_options']);
+    }
+
     /**
      * @param string $path
      * @param array $params

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

@@ -13,12 +13,16 @@ define([
     'jquery/ui',
     'prototype',
     'form',
-    'validation'
+    'validation',
+    'mage/translate'
 ], function (jQuery, mageTemplate, rg) {
     'use strict';
 
     return function (config) {
-        var attributeOption = {
+        var optionPanel = jQuery('#manage-options-panel'),
+            optionsValues = [],
+            editForm = jQuery('#edit_form'),
+            attributeOption = {
                 table: $('attribute-options-table'),
                 itemCount: 0,
                 totalItems: 0,
@@ -150,7 +154,7 @@ define([
             attributeOption.remove(event);
         });
 
-        jQuery('#manage-options-panel').on('render', function () {
+        optionPanel.on('render', function () {
             attributeOption.ignoreValidate();
 
             if (attributeOption.rendered) {
@@ -176,7 +180,31 @@ define([
                 });
             });
         }
+        editForm.on('submit', function () {
+            optionPanel.find('input')
+                .each(function () {
+                    if (this.disabled) {
+                        return;
+                    }
 
+                    if (this.type === 'checkbox' || this.type === 'radio') {
+                        if (this.checked) {
+                            optionsValues.push(this.name + '=' + jQuery(this).val());
+                        }
+                    } else {
+                        optionsValues.push(this.name + '=' + jQuery(this).val());
+                    }
+                });
+            jQuery('<input>')
+                .attr({
+                    type: 'hidden',
+                    name: 'serialized_options'
+                })
+                .val(JSON.stringify(optionsValues))
+                .prependTo(editForm);
+            optionPanel.find('table')
+                .replaceWith(jQuery('<div>').text(jQuery.mage.__('Sending attribute values as package.')));
+        });
         window.attributeOption = attributeOption;
         window.optionDefaultInputType = attributeOption.getOptionInputType();
 

app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php

@@ -14,6 +14,14 @@
  */
 interface StockStatusInterface extends ExtensibleDataInterface
 {
+    /**#@+
+     * Stock Status values.
+     */
+    const STATUS_OUT_OF_STOCK = 0;
+
+    const STATUS_IN_STOCK = 1;
+    /**#@-*/
+
     /**#@+
      * Stock status object data keys
      */

app/code/Magento/CatalogInventory/Model/Stock/Status.php

@@ -17,14 +17,6 @@
  */
 class Status extends AbstractExtensibleModel implements StockStatusInterface
 {
-    /**#@+
-     * Stock Status values
-     */
-    const STATUS_OUT_OF_STOCK = 0;
-
-    const STATUS_IN_STOCK = 1;
-    /**#@-*/
-
     /**#@+
      * Field name
      */

app/code/Magento/Customer/view/frontend/templates/form/login.phtml

@@ -42,3 +42,13 @@
         </form>
     </div>
 </div>
+
+<script type="text/x-magento-init">
+    {
+        ".field.email": {
+            "Magento_Customer/js/trim-username": {
+                "formSelector": "form.form-login"
+            }
+        }
+    }
+</script>

app/code/Magento/Customer/view/frontend/web/js/trim-username.js

@@ -0,0 +1,65 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    $.widget('mage.trimUsername', {
+        options: {
+            cache: {},
+            formSelector: 'form',
+            emailSelector: 'input[type="email"]'
+        },
+
+        /**
+         * Widget initialization
+         * @private
+         */
+        _create: function () {
+            // We need to look outside the module for backward compatibility, since someone can already use the module.
+            // @todo Narrow this selector in 2.3 so it doesn't accidentally finds the email field from the
+            // newsletter email field or any other "email" field.
+            this.options.cache.email = $(this.options.formSelector).find(this.options.emailSelector);
+            this._bind();
+        },
+
+        /**
+         * Event binding, will monitor change, keyup and paste events.
+         * @private
+         */
+        _bind: function () {
+            if (this.options.cache.email.length) {
+                this._on(this.options.cache.email, {
+                    'change': this._trimUsername,
+                    'keyup': this._trimUsername,
+                    'paste': this._trimUsername
+                });
+            }
+        },
+
+        /**
+         * Trim username
+         * @private
+         */
+        _trimUsername: function () {
+            var username = this._getUsername().trim();
+
+            this.options.cache.email.val(username);
+        },
+
+        /**
+         * Get username value
+         * @returns {*}
+         * @private
+         */
+        _getUsername: function () {
+            return this.options.cache.email.val();
+        }
+    });
+
+    return $.mage.trimUsername;
+});

app/code/Magento/Elasticsearch/Model/Config.php

@@ -6,6 +6,8 @@
 namespace Magento\Elasticsearch\Model;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Search\EngineResolverInterface;
+use Magento\Search\Model\EngineResolver;
 use Magento\Store\Model\ScopeInterface;
 use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface;
 use Magento\AdvancedSearch\Model\Client\ClientResolver;
@@ -54,21 +56,28 @@ class Config implements ClientOptionsInterface
      */
     private $clientResolver;
 
+    /**
+     * @var EngineResolverInterface
+     */
+    private $engineResolver;
+
     /**
      * Constructor
      *
      * @param ScopeConfigInterface $scopeConfig
-     * @param ClientResolver $clientResolver
-     * @param string $prefix
+     * @param ClientResolver|null $clientResolver
+     * @param EngineResolverInterface|null $engineResolver
+     * @param string|null $prefix
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         ClientResolver $clientResolver = null,
+        EngineResolverInterface $engineResolver = null,
         $prefix = null
     ) {
         $this->scopeConfig = $scopeConfig;
-        $this->clientResolver = $clientResolver ?:
-            ObjectManager::getInstance()->get(ClientResolver::class);
+        $this->clientResolver = $clientResolver ?: ObjectManager::getInstance()->get(ClientResolver::class);
+        $this->engineResolver = $engineResolver ?: ObjectManager::getInstance()->get(EngineResolverInterface::class);
         $this->prefix = $prefix ?: $this->clientResolver->getCurrentEngine();
     }
 
@@ -126,7 +135,7 @@ public function getSearchConfigData($field, $storeId = null)
      */
     public function isElasticsearchEnabled()
     {
-        return $this->getSearchConfigData('engine') == self::ENGINE_NAME;
+        return $this->engineResolver->getCurrentSearchEngine() === self::ENGINE_NAME;
     }
 
     /**

app/code/Magento/Elasticsearch/Model/Indexer/Plugin/DependencyUpdaterPlugin.php

@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Indexer\Plugin;
+
+use Magento\Elasticsearch\Model\Config;
+use Magento\Framework\Indexer\Config\DependencyInfoProvider as Provider;
+use Magento\CatalogSearch\Model\Indexer\Fulltext as CatalogSearchFulltextIndexer;
+use Magento\CatalogInventory\Model\Indexer\Stock\Processor as CatalogInventoryStockIndexer;
+
+/**
+ * Plugin for maintenance catalog search index dependency on stock index.
+ * If elasticsearch is used as search engine catalog search index becomes dependent on stock index. Elasticsearch
+ * module declares this dependence. But in case when elasticsearch module is enabled and elasticsearch engine isn`t
+ * used as search engine other search engines don`t need this dependency.
+ * This plugin remove catalog search index dependency on stock index when elasticsearch isn`t used as search engine
+ * except full reindexing. During full reindexing this dependency doesn`t make overhead.
+ */
+class DependencyUpdaterPlugin
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @param Config $config
+     */
+    public function __construct(Config $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * Remove index dependency, if it needed, on run reindexing by specifics indexes.
+     *
+     * @param Provider $provider
+     * @param array $dependencies
+     * @param string $indexerId
+     * @return array
+     * @see \Magento\Indexer\Console\Command\IndexerReindexCommand::getIndexers()
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetIndexerIdsToRunBefore(Provider $provider, array $dependencies, string $indexerId): array
+    {
+        if ($this->isFilteringNeeded($indexerId, CatalogSearchFulltextIndexer::INDEXER_ID)) {
+            $dependencies = array_diff($dependencies, [CatalogInventoryStockIndexer::INDEXER_ID]);
+        }
+
+        return $dependencies;
+    }
+
+    /**
+     * Remove index dependency, if it needed, on reindex triggers.
+     *
+     * @param Provider $provider
+     * @param array $dependencies
+     * @param string $indexerId
+     * @return array
+     * @see \Magento\Indexer\Model\Indexer\DependencyDecorator
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetIndexerIdsToRunAfter(Provider $provider, array $dependencies, string $indexerId): array
+    {
+        if ($this->isFilteringNeeded($indexerId, CatalogInventoryStockIndexer::INDEXER_ID)) {
+            $dependencies = array_diff($dependencies, [CatalogSearchFulltextIndexer::INDEXER_ID]);
+        }
+
+        return $dependencies;
+    }
+
+    /**
+     * @param string $currentIndexerId
+     * @param string $targetIndexerId
+     * @return bool
+     */
+    private function isFilteringNeeded(string $currentIndexerId, string $targetIndexerId): bool
+    {
+        return (!$this->config->isElasticsearchEnabled() && $targetIndexerId === $currentIndexerId);
+    }
+}