merge magento/2.3-develop into magento-chaika/Chaika-PR-2019-08-27

Author: magento-cicd2

app/code/Magento/AsynchronousOperations/README.md

@@ -1 +1,48 @@
- This component is designed  to provide response for client who launched the bulk operation as soon as possible and postpone handling of operations moving them to background handler.
+# Magento_AsynchronousOperations module
+
+This component is designed to provide a response for a client that launched the bulk operation as soon as possible and postpone handling of operations moving them to the background handler.
+
+## Installation details
+
+The Magento_AsynchronousOperations module creates the following tables in the database:
+
+- `magento_bulk`
+- `magento_operation`
+- `magento_acknowledged_bulk`
+
+Before disabling or uninstalling this module, note that the following modules depends on this module:
+
+- Magento_WebapiAsync 
+
+For information about module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).
+
+## Extensibility
+
+Extension developers can interact with the Magento_AsynchronousOperations module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_AsynchronousOperations module.
+
+### Layouts
+
+This module introduces the following layouts and layout handles in the `view/adminhtml/layout` directory:
+
+- `bulk_bulk_details`
+- `bulk_bulk_details_modal`
+- `bulk_index_index`
+
+For more information about layouts in Magento 2, see the [Layout documentation](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).
+
+### UI components
+
+You can extend Magento_AsynchronousOperations module using the following configuration files in the `view/adminhtml/ui_component/` directory:
+
+- `bulk_details_form`
+- `bulk_details_form_modal`
+- `bulk_listing`
+- `failed_operation_listing`
+- `failed_operation_modal_listing`
+- `notification_area`
+- `retriable_operation_listing`
+- `retriable_operation_modal_listing`
+
+For information about UI components in Magento 2, see [Overview of UI components](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/bk-ui_comps.html).

app/code/Magento/AuthorizenetAcceptjs/README.md

@@ -1 +1,29 @@
+# Magento_AuthorizenetAcceptjs module
+
 The Magento_AuthorizenetAcceptjs module implements the integration with the Authorize.Net payment gateway and makes the latter available as a payment method in Magento.
+
+## Installation details
+
+Before disabling or uninstalling this module, note that the `Magento_AuthorizenetCardinal` module depends on this module.
+
+For information about module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).
+
+## Structure
+
+`Gateway/` - the directory that contains payment gateway command interfaces and service classes.
+
+For information about typical file structure of a module in Magento 2, see [Module file structure](http://devdocs.magento.com/guides/v2.3/extension-dev-guide/build/module-file-structure.html#module-file-structure).
+
+## Extensibility
+
+Extension developers can interact with the Magento_AuthorizenetAcceptjs module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_AuthorizenetAcceptjs module.
+
+### Events
+
+This module observes the following events:
+
+- `payment_method_assign_data_authorizenet_acceptjs` event in the `Magento\AuthorizenetAcceptjs\Observer\DataAssignObserver` file.
+
+For information about an event in Magento 2, see [Events and observers](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/events-and-observers.html#events).

app/code/Magento/AuthorizenetCardinal/README.md

@@ -1 +1,23 @@
-The AuthorizenetCardinal module provides a possibility to enable 3-D Secure 2.0 support for AuthorizenetAcceptjs payment integration.
+# Magento_AuthorizenetCardinal module
+
+Use the Magento_AuthorizenetCardinal module to enable 3D Secure 2.0 support for AuthorizenetAcceptjs payment integrations.
+
+## Structure
+
+`Gateway/` - the directory that contains payment gateway command interfaces and service classes.
+
+For information about typical file structure of a module in Magento 2, see [Module file structure](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/build/module-file-structure.html#module-file-structure).
+
+## Extensibility
+
+Extension developers can interact with the Magento_AuthorizenetCardinal module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_AuthorizenetCardinal module.
+
+### Events
+   
+This module observes the following events:
+
+- `payment_method_assign_data_authorizenet_acceptjs` event in the `Magento\AuthorizenetCardinal\Observer\DataAssignObserver` file.
+
+For information about an event in Magento 2, see [Events and observers](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/events-and-observers.html#events).

app/code/Magento/AuthorizenetGraphQl/README.md

@@ -1,3 +1,9 @@
-# AuthorizenetGraphQl
+# Magento_AuthorizenetGraphQl module
 
- **AuthorizenetGraphQl** defines the data types needed to pass payment information data from the client to Magento.
+The Magento_AuthorizenetGraphQl module defines the data types needed to pass payment information data from the client to Magento.
+
+## Extensibility
+
+Extension developers can interact with the Magento_AuthorizenetGraphQl module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_AuthorizenetGraphQl module.

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

@@ -15,6 +15,7 @@
 /**
  * Catalog entity abstract model
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -468,7 +469,7 @@ protected function _getOrigObject($object)
      *
      * @param AbstractAttribute $attribute
      * @param mixed $value New value of the attribute.
-     * @param array &$origData
+     * @param array $origData
      * @return bool
      */
     protected function _canUpdateAttribute(AbstractAttribute $attribute, $value, array &$origData)
@@ -560,15 +561,19 @@ public function getAttributeRawValue($entityId, $attribute, $store)
         $store = (int) $store;
         if ($typedAttributes) {
             foreach ($typedAttributes as $table => $_attributes) {
+                $defaultJoinCondition = [
+                    $connection->quoteInto('default_value.attribute_id IN (?)', array_keys($_attributes)),
+                    "default_value.{$this->getLinkField()} = e.{$this->getLinkField()}",
+                    'default_value.store_id = 0',
+                ];
+
                 $select = $connection->select()
-                    ->from(['default_value' => $table], ['attribute_id'])
-                    ->join(
-                        ['e' => $this->getTable($this->getEntityTable())],
-                        'e.' . $this->getLinkField() . ' = ' . 'default_value.' . $this->getLinkField(),
-                        ''
-                    )->where('default_value.attribute_id IN (?)', array_keys($_attributes))
-                    ->where("e.entity_id = :entity_id")
-                    ->where('default_value.store_id = ?', 0);
+                    ->from(['e' => $this->getTable($this->getEntityTable())], [])
+                    ->joinLeft(
+                        ['default_value' => $table],
+                        implode(' AND ', $defaultJoinCondition),
+                        []
+                    )->where("e.entity_id = :entity_id");
 
                 $bind = ['entity_id' => $entityId];
 
@@ -578,6 +583,11 @@ public function getAttributeRawValue($entityId, $attribute, $store)
                         'default_value.value',
                         'store_value.value'
                     );
+                    $attributeIdExpr = $connection->getCheckSql(
+                        'store_value.attribute_id IS NULL',
+                        'default_value.attribute_id',
+                        'store_value.attribute_id'
+                    );
                     $joinCondition = [
                         $connection->quoteInto('store_value.attribute_id IN (?)', array_keys($_attributes)),
                         "store_value.{$this->getLinkField()} = e.{$this->getLinkField()}",
@@ -587,23 +597,28 @@ public function getAttributeRawValue($entityId, $attribute, $store)
                     $select->joinLeft(
                         ['store_value' => $table],
                         implode(' AND ', $joinCondition),
-                        ['attr_value' => $valueExpr]
+                        ['attribute_id' => $attributeIdExpr, 'attr_value' => $valueExpr]
                     );
 
                     $bind['store_id'] = $store;
                 } else {
-                    $select->columns(['attr_value' => 'value'], 'default_value');
+                    $select->columns(
+                        ['attribute_id' => 'attribute_id', 'attr_value' => 'value'],
+                        'default_value'
+                    );
                 }
 
                 $result = $connection->fetchPairs($select, $bind);
                 foreach ($result as $attrId => $value) {
-                    $attrCode = $typedAttributes[$table][$attrId];
-                    $attributesData[$attrCode] = $value;
+                    if ($attrId !== '') {
+                        $attrCode = $typedAttributes[$table][$attrId];
+                        $attributesData[$attrCode] = $value;
+                    }
                 }
             }
         }
 
-        if (is_array($attributesData) && sizeof($attributesData) == 1) {
+        if (is_array($attributesData) && count($attributesData) == 1) {
             $attributesData = array_shift($attributesData);
         }
 

app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml

@@ -40,6 +40,8 @@
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteTestWebsite">
                 <argument name="websiteName" value="{{customWebsite.name}}"/>
             </actionGroup>
+            <actionGroup ref="GoToProductCatalogPage" stepKey="goToProductCatalogPage"/>
+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
             <actionGroup ref="ResetWebUrlOptions" stepKey="resetUrlOption"/>
             <magentoCLI command="indexer:reindex" stepKey="reindex"/>
             <magentoCLI command="cache:flush" stepKey="flushCache"/>

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml

@@ -17,6 +17,9 @@
             <description value="Admin should be able to see the full title of the selected custom option value in the order"/>
             <severity value="MAJOR"/>
             <testCaseId value="MC-3043"/>
+            <skip>
+                <issueId value="MQE-1128"/>
+            </skip>
         </annotations>
         <before>
             <!--Create Simple Product with Custom Options-->

app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.xml

@@ -21,5 +21,6 @@
         <element name="emptyRecords" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
         <element name="gridRow" type="text" selector="//tr[@data-role='row']"/>
         <element name="numberOfSearchTermResults" type="text" selector="//tr[@data-role='row']/td[@data-column='num_results']"/>
+        <element name="selectMassActionCheckbox" type="select" selector="//select[@id='search_term_grid_massaction-mass-select']"/>
     </section>
 </sections>

app/code/Magento/Checkout/Model/Session.php

@@ -17,6 +17,7 @@
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class Session extends \Magento\Framework\Session\SessionManager
 {
@@ -46,6 +47,15 @@ class Session extends \Magento\Framework\Session\SessionManager
      */
     protected $_loadInactive = false;
 
+    /**
+     * A flag to track when the quote is being loaded and attached to the session object.
+     *
+     * Used in trigger_recollect infinite loop detection.
+     *
+     * @var bool
+     */
+    private $isLoading = false;
+
     /**
      * Loaded order instance
      *
@@ -227,6 +237,10 @@ public function getQuote()
         $this->_eventManager->dispatch('custom_quote_process', ['checkout_session' => $this]);
 
         if ($this->_quote === null) {
+            if ($this->isLoading) {
+                throw new \LogicException("Infinite loop detected, review the trace for the looping path");
+            }
+            $this->isLoading = true;
             $quote = $this->quoteFactory->create();
             if ($this->getQuoteId()) {
                 try {
@@ -289,6 +303,7 @@ public function getQuote()
 
             $quote->setStore($this->_storeManager->getStore());
             $this->_quote = $quote;
+            $this->isLoading = false;
         }
 
         if (!$this->isQuoteMasked() && !$this->_customerSession->isLoggedIn() && $this->getQuoteId()) {

app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information.js

@@ -28,9 +28,16 @@ define([
          * @return {String}
          */
         getShippingMethodTitle: function () {
-            var shippingMethod = quote.shippingMethod();
+            var shippingMethod = quote.shippingMethod(),
+                shippingMethodTitle = '';
 
-            return shippingMethod ? shippingMethod['carrier_title'] + ' - ' + shippingMethod['method_title'] : '';
+            if (typeof shippingMethod['method_title'] !== 'undefined') {
+                shippingMethodTitle = ' - ' + shippingMethod['method_title'];
+            }
+
+            return shippingMethod ?
+                shippingMethod['carrier_title'] + shippingMethodTitle :
+                shippingMethod['carrier_title'];
         },
 
         /**