Merge branch '2.3-develop' into MAGETWO-89540

Author: Dmytro Voskoboinikov

.travis.yml

@@ -22,7 +22,7 @@ env:
   global:
     - COMPOSER_BIN_DIR=~/bin
     - INTEGRATION_SETS=3
-    - NODE_JS_VERSION=6
+    - NODE_JS_VERSION=8
     - MAGENTO_HOST_NAME="magento2.travis"
   matrix:
     - TEST_SUITE=unit

COPYING.txt

@@ -1,4 +1,4 @@
-Copyright © 2013-2018 Magento, Inc.
+Copyright © 2013-present Magento, Inc.
 
 Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
 

app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php

@@ -10,6 +10,10 @@
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver as TableResolver;
+use Magento\Framework\Search\Request\Dimension;
+use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
 
 /**
  * @api
@@ -29,22 +33,30 @@ class Index extends AbstractDb
      */
     protected $metadataPool;
 
+    /**
+     * @var TableResolver
+     */
+    private $tableResolver;
+
     /**
      * Index constructor.
      * @param Context $context
      * @param StoreManagerInterface $storeManager
      * @param MetadataPool $metadataPool
      * @param null $connectionName
+     * @param TableResolver|null $tableResolver
      */
     public function __construct(
         Context $context,
         StoreManagerInterface $storeManager,
         MetadataPool $metadataPool,
-        $connectionName = null
+        $connectionName = null,
+        TableResolver $tableResolver = null
     ) {
         parent::__construct($context, $connectionName);
         $this->storeManager = $storeManager;
         $this->metadataPool = $metadataPool;
+        $this->tableResolver = $tableResolver ?: ObjectManager::getInstance()->get(TableResolver::class);
     }
 
     /**
@@ -116,8 +128,17 @@ public function getCategoryProductIndexData($storeId = null, $productIds = null)
     {
         $connection = $this->getConnection();
 
+        $catalogCategoryProductDimension = new Dimension(\Magento\Store\Model\Store::ENTITY, $storeId);
+
+        $catalogCategoryProductTableName = $this->tableResolver->resolve(
+            AbstractAction::MAIN_INDEX_TABLE,
+            [
+                $catalogCategoryProductDimension
+            ]
+        );
+
         $select = $connection->select()->from(
-            [$this->getTable('catalog_category_product_index')],
+            [$catalogCategoryProductTableName],
             ['category_id', 'product_id', 'position', 'store_id']
         )->where(
             'store_id = ?',

app/code/Magento/Analytics/etc/adminhtml/system.xml

@@ -17,14 +17,14 @@
                 Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the
                 "Go to Advanced Reporting" link. </br> For more information, see our <a href="https://magento.com/legal/terms/cloud-terms">
                 terms and conditions</a>.]]></comment>
-                <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Advanced Reporting Service</label>
                     <source_model>Magento\Config\Model\Config\Source\Enabledisable</source_model>
                     <backend_model>Magento\Analytics\Model\Config\Backend\Enabled</backend_model>
                     <frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\SubscriptionStatusLabel</frontend_model>
                     <config_path>analytics/subscription/enabled</config_path>
                 </field>
-                <field id="collection_time" translate="label comment" type="time" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="collection_time" translate="label" type="time" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Time of day to send data</label>
                     <frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\CollectionTimeLabel</frontend_model>
                     <backend_model>Magento\Analytics\Model\Config\Backend\CollectionTime</backend_model>

app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js

@@ -13,11 +13,19 @@ define([
     'jquery',
     'mage/template',
     'Magento_Ui/js/modal/alert',
+    'Magento_Ui/js/form/element/file-uploader',
     'mage/translate',
     'jquery/file-uploader'
-], function ($, mageTemplate, alert) {
+], function ($, mageTemplate, alert, FileUploader) {
     'use strict';
 
+    var fileUploader = new FileUploader({
+        dataScope: '',
+        isMultipleFiles: true
+    });
+
+    fileUploader.initUploader();
+
     $.widget('mage.mediaUploader', {
 
         /**
@@ -79,10 +87,9 @@ define([
                     if (data.result && !data.result.error) {
                         self.element.trigger('addItem', data.result);
                     } else {
-                        alert({
-                            content: $.mage.__('We don\'t recognize or support this file extension type.')
-                        });
+                        fileUploader.aggregateError(data.files[0].name, data.result.error);
                     }
+
                     self.element.find('#' + data.fileId).remove();
                 },
 
@@ -108,7 +115,9 @@ define([
                         .delay(2000)
                         .hide('highlight')
                         .remove();
-                }
+                },
+
+                stop: fileUploader.uploaderConfig.stop
             });
 
             this.element.find('input[type=file]').fileupload('option', {

app/code/Magento/Braintree/Gateway/Validator/ErrorCodeProvider.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Gateway\Validator;
+
+use Braintree\Error\ErrorCollection;
+use Braintree\Error\Validation;
+use Braintree\Result\Error;
+use Braintree\Result\Successful;
+
+/**
+ * Processes errors codes from Braintree response.
+ */
+class ErrorCodeProvider
+{
+    /**
+     * Retrieves list of error codes from Braintree response.
+     *
+     * @param Successful|Error $response
+     * @return array
+     */
+    public function getErrorCodes($response): array
+    {
+        $result = [];
+        if (!$response instanceof Error) {
+            return $result;
+        }
+
+        /** @var ErrorCollection $collection */
+        $collection = $response->errors;
+
+        /** @var Validation $error */
+        foreach ($collection->deepAll() as $error) {
+            $result[] = $error->code;
+        }
+
+        return $result;
+    }
+}

app/code/Magento/Braintree/Gateway/Validator/GeneralResponseValidator.php

@@ -18,16 +18,26 @@ class GeneralResponseValidator extends AbstractValidator
      */
     protected $subjectReader;
 
+    /**
+     * @var ErrorCodeProvider
+     */
+    private $errorCodeProvider;
+
     /**
      * Constructor
      *
      * @param ResultInterfaceFactory $resultFactory
      * @param SubjectReader $subjectReader
+     * @param ErrorCodeProvider $errorCodeProvider
      */
-    public function __construct(ResultInterfaceFactory $resultFactory, SubjectReader $subjectReader)
-    {
+    public function __construct(
+        ResultInterfaceFactory $resultFactory,
+        SubjectReader $subjectReader,
+        ErrorCodeProvider $errorCodeProvider
+    ) {
         parent::__construct($resultFactory);
         $this->subjectReader = $subjectReader;
+        $this->errorCodeProvider = $errorCodeProvider;
     }
 
     /**
@@ -49,8 +59,9 @@ public function validate(array $validationSubject)
                 $errorMessages = array_merge($errorMessages, $validationResult[1]);
             }
         }
+        $errorCodes = $this->errorCodeProvider->getErrorCodes($response);
 
-        return $this->createResult($isValid, $errorMessages);
+        return $this->createResult($isValid, $errorMessages, $errorCodes);
     }
 
     /**
@@ -62,7 +73,7 @@ protected function getResponseValidators()
             function ($response) {
                 return [
                     property_exists($response, 'success') && $response->success === true,
-                    [__('Braintree error response.')]
+                    [$response->message ?? __('Braintree error response.')]
                 ];
             }
         ];

app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php

@@ -66,6 +66,13 @@ public function __construct(
     public function beforeSave()
     {
         $value = $this->getValue();
+        if (!is_array($value)) {
+            try {
+                $value = $this->serializer->unserialize($value);
+            } catch (\InvalidArgumentException $e) {
+                $value = [];
+            }
+        }
         $result = [];
         foreach ($value as $data) {
             if (empty($data['country_id']) || empty($data['cc_types'])) {

app/code/Magento/Braintree/Test/Unit/Gateway/Command/GetPaymentNonceCommandTest.php

@@ -99,7 +99,7 @@ protected function setUp()
             ->getMock();
 
         $this->validationResultMock = $this->getMockBuilder(ResultInterface::class)
-            ->setMethods(['isValid', 'getFailsDescription'])
+            ->setMethods(['isValid', 'getFailsDescription', 'getErrorCodes'])
             ->getMock();
 
         $this->responseValidatorMock = $this->getMockBuilder(PaymentNonceResponseValidator::class)