merge magento/2.3-develop into magento-trigger/MC-16650

Author: magento-cicd2

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

@@ -50,7 +50,13 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
 
     const VALIDATOR_WEBSITE = 'validator_website';
 
-    const VALIDATOR_TEAR_PRICE = 'validator_tear_price';
+    /**
+     * @deprecated
+     * @see VALIDATOR_TIER_PRICE
+     */
+    private const VALIDATOR_TEAR_PRICE = 'validator_tier_price';
+
+    private const VALIDATOR_TIER_PRICE = 'validator_tier_price';
 
     /**
      * Validation failure message template definitions.
@@ -221,7 +227,7 @@ public function __construct(
         $this->_catalogProductEntity = $this->_resourceFactory->create()->getTable('catalog_product_entity');
         $this->_oldSkus = $this->retrieveOldSkus();
         $this->_validators[self::VALIDATOR_WEBSITE] = $websiteValidator;
-        $this->_validators[self::VALIDATOR_TEAR_PRICE] = $tierPriceValidator;
+        $this->_validators[self::VALIDATOR_TIER_PRICE] = $tierPriceValidator;
         $this->errorAggregator = $errorAggregator;
 
         foreach (array_merge($this->errorMessageTemplates, $this->_messageTemplates) as $errorCode => $message) {
@@ -536,7 +542,7 @@ protected function getWebSiteId($websiteCode)
      */
     protected function getCustomerGroupId($customerGroup)
     {
-        $customerGroups = $this->_getValidator(self::VALIDATOR_TEAR_PRICE)->getCustomerGroups();
+        $customerGroups = $this->_getValidator(self::VALIDATOR_TIER_PRICE)->getCustomerGroups();
         return $customerGroup == self::VALUE_ALL_GROUPS ? 0 : $customerGroups[$customerGroup];
     }
 

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php

@@ -15,6 +15,9 @@
  */
 class AdvancedPricingTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractImportTestCase
 {
+    /**
+     * DB Table data
+     */
     const TABLE_NAME = 'tableName';
     const LINK_FIELD = 'linkField';
 
@@ -54,7 +57,7 @@ class AdvancedPricingTest extends \Magento\ImportExport\Test\Unit\Model\Import\A
     protected $websiteValidator;
 
     /**
-     * @var AdvancedPricing\Validator\TearPrice |\PHPUnit_Framework_MockObject_MockObject
+     * @var AdvancedPricing\Validator\TierPrice |\PHPUnit_Framework_MockObject_MockObject
      */
     protected $tierPriceValidator;
 

app/code/Magento/AmqpStore/Plugin/Framework/Amqp/Bulk/Exchange.php

@@ -91,7 +91,6 @@ public function beforeEnqueue(SubjectExchange $subject, $topic, array $envelopes
                 if ($headers instanceof AMQPTable) {
                     try {
                         $headers->set('store_id', $storeId);
-                    // phpcs:ignore Magento2.Exceptions.ThrowCatch
                     } catch (AMQPInvalidArgumentException $ea) {
                         $errorMessage = sprintf("Can't set storeId to amqp message. Error %s.", $ea->getMessage());
                         $this->logger->error($errorMessage);

app/code/Magento/Authorizenet/README.md

@@ -1 +1,42 @@
+# Magento_Authorizenet module
+
 The Magento_Authorizenet module implements the integration with the Authorize.Net payment gateway and makes the latter available as a payment method in Magento.
+
+## Extensibility
+
+Extension developers can interact with the Magento_Authorizenet 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_Authorizenet module.
+
+### Events
+
+This module dispatches the following events:
+
+ - `checkout_directpost_placeOrder` event in the `\Magento\Authorizenet\Controller\Directpost\Payment\Place::placeCheckoutOrder()` method. Parameters:
+   - `result` is a data object (`\Magento\Framework\DataObject` class).
+   - `action` is a controller object (`\Magento\Authorizenet\Controller\Directpost\Payment\Place`).
+ 
+ - `order_cancel_after` event in the `\Magento\Authorizenet\Model\Directpost::declineOrder()` method. Parameters:
+   - `order` is an order object (`\Magento\Sales\Model\Order` class).
+   
+
+This module observes the following events:
+
+ - `checkout_submit_all_after` event in the `Magento\Authorizenet\Observer\SaveOrderAfterSubmitObserver` file.
+ - `checkout_directpost_placeOrder` event in the `Magento\Authorizenet\Observer\AddFieldsToResponseObserver` file.
+
+For information about events in Magento 2, see [Events and observers](http://devdocs.magento.com/guides/v2.3/extension-dev-guide/events-and-observers.html#events).
+
+### Layouts
+
+This module introduces the following layouts and layout handles in the `view/adminhtml/layout` directory:
+
+- `adminhtml_authorizenet_directpost_payment_redirect`
+
+This module introduces the following layouts and layout handles in the `view/frontend/layout` directory:
+
+- `authorizenet_directpost_payment_backendresponse`
+- `authorizenet_directpost_payment_redirect`
+- `authorizenet_directpost_payment_response`
+
+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).

app/code/Magento/AuthorizenetGraphQl/Model/AuthorizenetDataProvider.php

@@ -9,6 +9,7 @@
 
 use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderInterface;
 use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 
 /**
  * SetPaymentMethod additional data provider model for Authorizenet payment method
@@ -36,10 +37,32 @@ public function __construct(
      *
      * @param array $data
      * @return array
+     * @throws GraphQlInputException
      */
     public function getData(array $data): array
     {
-        $additionalData = $this->arrayManager->get(static::PATH_ADDITIONAL_DATA, $data) ?? [];
+        if (!isset($data[self::PATH_ADDITIONAL_DATA])) {
+            throw new GraphQlInputException(
+                __('Required parameter "authorizenet_acceptjs" for "payment_method" is missing.')
+            );
+        }
+        if (!isset($data[self::PATH_ADDITIONAL_DATA]['opaque_data_descriptor'])) {
+            throw new GraphQlInputException(
+                __('Required parameter "opaque_data_descriptor" for "authorizenet_acceptjs" is missing.')
+            );
+        }
+        if (!isset($data[self::PATH_ADDITIONAL_DATA]['opaque_data_value'])) {
+            throw new GraphQlInputException(
+                __('Required parameter "opaque_data_value" for "authorizenet_acceptjs" is missing.')
+            );
+        }
+        if (!isset($data[self::PATH_ADDITIONAL_DATA]['cc_last_4'])) {
+            throw new GraphQlInputException(
+                __('Required parameter "cc_last_4" for "authorizenet_acceptjs" is missing.')
+            );
+        }
+
+        $additionalData = $this->arrayManager->get(static::PATH_ADDITIONAL_DATA, $data);
         foreach ($additionalData as $key => $value) {
             $additionalData[$this->convertSnakeCaseToCamelCase($key)] = $value;
             unset($additionalData[$key]);

app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php

@@ -127,7 +127,6 @@ public function execute()
             $adminSession->destroy();
 
             $response->setRedirectUrl($this->getUrl('*'));
-            // phpcs:disable Magento2.Exceptions.ThrowCatch
         } catch (\Magento\Framework\Backup\Exception\CantLoadSnapshot $e) {
             $errorMsg = __('We can\'t find the backup file.');
         } catch (\Magento\Framework\Backup\Exception\FtpConnectionFailed $e) {

app/code/Magento/Braintree/Gateway/Request/BillingAddressDataBuilder.php

@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Gateway\Request;
+
+use Magento\Payment\Gateway\Request\BuilderInterface;
+use Magento\Braintree\Gateway\SubjectReader;
+
+/**
+ * Class BillingAddressDataBuilder
+ */
+class BillingAddressDataBuilder implements BuilderInterface
+{
+    /**
+     * @var SubjectReader
+     */
+    private $subjectReader;
+
+    /**
+     * BillingAddress block name
+     */
+    private const BILLING_ADDRESS = 'billing';
+
+    /**
+     * The customer’s company. 255 character maximum.
+     */
+    private const COMPANY = 'company';
+
+    /**
+     * The first name value must be less than or equal to 255 characters.
+     */
+    private const FIRST_NAME = 'firstName';
+
+    /**
+     * The last name value must be less than or equal to 255 characters.
+     */
+    private const LAST_NAME = 'lastName';
+
+    /**
+     * The street address. Maximum 255 characters, and must contain at least 1 digit.
+     * Required when AVS rules are configured to require street address.
+     */
+    private const STREET_ADDRESS = 'streetAddress';
+
+    /**
+     * The postal code. Postal code must be a string of 5 or 9 alphanumeric digits,
+     * optionally separated by a dash or a space. Spaces, hyphens,
+     * and all other special characters are ignored.
+     */
+    private const POSTAL_CODE = 'postalCode';
+
+    /**
+     * The ISO 3166-1 alpha-2 country code specified in an address.
+     * The gateway only accepts specific alpha-2 values.
+     *
+     * @link https://developers.braintreepayments.com/reference/general/countries/php#list-of-countries
+     */
+    private const COUNTRY_CODE = 'countryCodeAlpha2';
+
+    /**
+     * The extended address information—such as apartment or suite number. 255 character maximum.
+     */
+    private const EXTENDED_ADDRESS = 'extendedAddress';
+
+    /**
+     * The locality/city. 255 character maximum.
+     */
+    private const LOCALITY = 'locality';
+
+    /**
+     * The state or province. For PayPal addresses, the region must be a 2-letter abbreviation;
+     */
+    private const REGION = 'region';
+
+    /**
+     * @param SubjectReader $subjectReader
+     */
+    public function __construct(SubjectReader $subjectReader)
+    {
+        $this->subjectReader = $subjectReader;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function build(array $buildSubject)
+    {
+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
+
+        $result = [];
+        $order = $paymentDO->getOrder();
+
+        $billingAddress = $order->getBillingAddress();
+        if ($billingAddress) {
+            $result[self::BILLING_ADDRESS] = [
+                self::REGION => $billingAddress->getRegionCode(),
+                self::POSTAL_CODE => $billingAddress->getPostcode(),
+                self::COUNTRY_CODE => $billingAddress->getCountryId(),
+                self::FIRST_NAME => $billingAddress->getFirstname(),
+                self::STREET_ADDRESS => $billingAddress->getStreetLine1(),
+                self::LAST_NAME => $billingAddress->getLastname(),
+                self::COMPANY => $billingAddress->getCompany(),
+                self::EXTENDED_ADDRESS => $billingAddress->getStreetLine2(),
+                self::LOCALITY => $billingAddress->getCity()
+            ];
+        }
+
+        return $result;
+    }
+}

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

@@ -74,9 +74,9 @@ public function getErrorCodeDataProvider(): array
                 'errors' => [],
                 'transaction' => [
                     'status' => 'processor_declined',
-                    'processorResponseCode' => '1000'
+                    'processorResponseCode' => '2059'
                 ],
-                'expectedResult' => ['1000']
+                'expectedResult' => ['2059']
             ],
             [
                 'errors' => [

app/code/Magento/Braintree/composer.json

@@ -22,11 +22,11 @@
         "magento/module-sales": "*",
         "magento/module-ui": "*",
         "magento/module-vault": "*",
-        "magento/module-multishipping": "*"
+        "magento/module-multishipping": "*",
+        "magento/module-theme": "*"
     },
     "suggest": {
-        "magento/module-checkout-agreements": "*",
-        "magento/module-theme": "*"
+        "magento/module-checkout-agreements": "*"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/Braintree/etc/braintree_error_mapping.xml

@@ -21,6 +21,7 @@
         <message code="81723" translate="true">Cardholder name is too long.</message>
         <message code="81736" translate="true">CVV verification failed.</message>
         <message code="cvv" translate="true">CVV verification failed.</message>
+        <message code="2059" translate="true">Address Verification Failed.</message>
         <message code="81737" translate="true">Postal code verification failed.</message>
         <message code="81750" translate="true">Credit card number is prohibited.</message>
         <message code="81801" translate="true">Addresses must have at least one field filled in.</message>