Merge mainline

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/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)

app/code/Magento/Braintree/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php

@@ -5,12 +5,14 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Validator;
 
-use Braintree\Transaction;
+use Braintree\Result\Error;
+use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Braintree\Gateway\Validator\ErrorCodeProvider;
+use Magento\Braintree\Gateway\Validator\GeneralResponseValidator;
 use Magento\Framework\Phrase;
-use Magento\Payment\Gateway\Validator\ResultInterface;
+use Magento\Payment\Gateway\Validator\Result;
 use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
-use Magento\Braintree\Gateway\Validator\GeneralResponseValidator;
-use Magento\Braintree\Gateway\SubjectReader;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class GeneralResponseValidatorTest extends \PHPUnit\Framework\TestCase
 {
@@ -20,14 +22,9 @@ class GeneralResponseValidatorTest extends \PHPUnit\Framework\TestCase
     private $responseValidator;
 
     /**
-     * @var ResultInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $resultInterfaceFactoryMock;
-
-    /**
-     * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResultInterfaceFactory|MockObject
      */
-    private $subjectReaderMock;
+    private $resultInterfaceFactory;
 
     /**
      * Set up
@@ -36,85 +33,105 @@ class GeneralResponseValidatorTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->resultInterfaceFactoryMock = $this->getMockBuilder(
-            \Magento\Payment\Gateway\Validator\ResultInterfaceFactory::class
-        )->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
+        $this->resultInterfaceFactory = $this->getMockBuilder(ResultInterfaceFactory::class)
             ->disableOriginalConstructor()
+            ->setMethods(['create'])
             ->getMock();
 
         $this->responseValidator = new GeneralResponseValidator(
-            $this->resultInterfaceFactoryMock,
-            $this->subjectReaderMock
+            $this->resultInterfaceFactory,
+            new SubjectReader(),
+            new ErrorCodeProvider()
         );
     }
 
     /**
-     * Run test for validate method
+     * Checks a case when the validator processes successful and failed transactions.
      *
      * @param array $validationSubject
      * @param bool $isValid
      * @param Phrase[] $messages
+     * @param array $errorCodes
      * @return void
      *
      * @dataProvider dataProviderTestValidate
      */
-    public function testValidate(array $validationSubject, $isValid, $messages)
+    public function testValidate(array $validationSubject, bool $isValid, $messages, array $errorCodes)
     {
-        /** @var ResultInterface|\PHPUnit_Framework_MockObject_MockObject $resultMock */
-        $resultMock = $this->createMock(ResultInterface::class);
-
-        $this->subjectReaderMock->expects(self::once())
-            ->method('readResponseObject')
-            ->with($validationSubject)
-            ->willReturn($validationSubject['response']['object']);
+        $result = new Result($isValid, $messages);
 
-        $this->resultInterfaceFactoryMock->expects(self::once())
-            ->method('create')
+        $this->resultInterfaceFactory->method('create')
             ->with([
                 'isValid' => $isValid,
-                'failsDescription' => $messages
+                'failsDescription' => $messages,
+                'errorCodes' => $errorCodes
             ])
-            ->willReturn($resultMock);
+            ->willReturn($result);
 
-        $actualMock = $this->responseValidator->validate($validationSubject);
+        $actual = $this->responseValidator->validate($validationSubject);
 
-        self::assertEquals($resultMock, $actualMock);
+        self::assertEquals($result, $actual);
     }
 
     /**
+     * Gets variations for different type of response.
+     *
      * @return array
      */
     public function dataProviderTestValidate()
     {
-        $successTrue = new \stdClass();
-        $successTrue->success = true;
+        $successTransaction = new \stdClass();
+        $successTransaction->success = true;
+
+        $failureTransaction = new \stdClass();
+        $failureTransaction->success = false;
+        $failureTransaction->message = 'Transaction was failed.';
 
-        $successFalse = new \stdClass();
-        $successFalse->success = false;
+        $errors = [
+            'errors' => [
+                [
+                    'code' => 81804,
+                    'attribute' => 'base',
+                    'message' => 'Cannot process transaction.'
+                ]
+            ]
+        ];
+        $errorTransaction = new Error(['errors' => $errors]);
 
         return [
             [
                 'validationSubject' => [
                     'response' => [
-                        'object' => $successTrue
+                        'object' => $successTransaction
                     ],
                 ],
                 'isValid' => true,
-                []
+                [],
+                'errorCodes' => []
+            ],
+            [
+                'validationSubject' => [
+                    'response' => [
+                        'object' => $failureTransaction
+                    ]
+                ],
+                'isValid' => false,
+                [
+                    __('Transaction was failed.')
+                ],
+                'errorCodes' => []
             ],
             [
                 'validationSubject' => [
                     'response' => [
-                        'object' => $successFalse
+                        'object' => $errorTransaction
                     ]
                 ],
                 'isValid' => false,
                 [
                     __('Braintree error response.')
-                ]
+                ],
+                'errorCodes' => ['81804']
             ]
         ];
     }