MAGETWO-83276: [2.3] Magento 2 Store Code validation regex: doesn't support uppercase letters in store code #12010

 - Merge Pull Request magento/magento2#12010 from manuelson/magento2:feature/11996
 - Merged commits:
   1. d4d316e
   2. d5109b7
   3. d486cb1

Author: Volodymyr Kublytskyi

app/code/Magento/Braintree/Model/InstantPurchase/CreditCard/AvailabilityChecker.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Model\InstantPurchase\CreditCard;
+
+use Magento\Braintree\Gateway\Config\Config;
+use Magento\InstantPurchase\PaymentMethodIntegration\AvailabilityCheckerInterface;
+
+/**
+ * Availability of Braintree vaults for instant purchase.
+ */
+class AvailabilityChecker implements AvailabilityCheckerInterface
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * AvailabilityChecker constructor.
+     * @param Config $config
+     */
+    public function __construct(Config $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isAvailable(): bool
+    {
+        if ($this->config->isVerify3DSecure()) {
+            // Support of 3D secure not implemented for instant purchase yet.
+            return false;
+        }
+
+        return true;
+    }
+}

app/code/Magento/Braintree/Model/InstantPurchase/CreditCard/TokenFormatter.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Model\InstantPurchase\CreditCard;
+
+use Magento\InstantPurchase\PaymentMethodIntegration\PaymentTokenFormatterInterface;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+
+/**
+ * Braintree stored credit card formatter.
+ */
+class TokenFormatter implements PaymentTokenFormatterInterface
+{
+    /**
+     * Most used credit card types
+     * @var array
+     */
+    public static $baseCardTypes = [
+        'AE' => 'American Express',
+        'VI' => 'Visa',
+        'MC' => 'MasterCard',
+        'DI' => 'Discover',
+        'JBC' => 'JBC',
+        'CUP' => 'China Union Pay',
+        'MI' => 'Maestro',
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function formatPaymentToken(PaymentTokenInterface $paymentToken): string
+    {
+        $details = json_decode($paymentToken->getTokenDetails() ?: '{}', true);
+        if (!isset($details['type'], $details['maskedCC'], $details['expirationDate'])) {
+            throw new \InvalidArgumentException('Invalid Braintree credit card token details.');
+        }
+
+        if (isset(self::$baseCardTypes[$details['type']])) {
+            $ccType = self::$baseCardTypes[$details['type']];
+        } else {
+            $ccType = $details['type'];
+        }
+
+        $formatted = sprintf(
+            '%s: %s, %s: %s (%s: %s)',
+            __('Credit Card'),
+            $ccType,
+            __('ending'),
+            $details['maskedCC'],
+            __('expires'),
+            $details['expirationDate']
+        );
+
+        return $formatted;
+    }
+}

app/code/Magento/Braintree/Model/InstantPurchase/PayPal/TokenFormatter.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Model\InstantPurchase\PayPal;
+
+use Magento\InstantPurchase\PaymentMethodIntegration\PaymentTokenFormatterInterface;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+
+/**
+ * Braintree PayPal token formatter.
+ */
+class TokenFormatter implements PaymentTokenFormatterInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function formatPaymentToken(PaymentTokenInterface $paymentToken): string
+    {
+        $details = json_decode($paymentToken->getTokenDetails() ?: '{}', true);
+        if (!isset($details['payerEmail'])) {
+            throw new \InvalidArgumentException('Invalid Braintree PayPal token details.');
+        }
+
+        $formatted = sprintf(
+            '%s: %s',
+            __('PayPal'),
+            $details['payerEmail']
+        );
+
+        return $formatted;
+    }
+}

app/code/Magento/Braintree/Model/InstantPurchase/PaymentAdditionalInformationProvider.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Model\InstantPurchase;
+
+use Magento\Braintree\Gateway\Command\GetPaymentNonceCommand;
+use Magento\InstantPurchase\PaymentMethodIntegration\PaymentAdditionalInformationProviderInterface;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+
+/**
+ * Provides Braintree specific payment additional information for instant purchase.
+ */
+class PaymentAdditionalInformationProvider implements PaymentAdditionalInformationProviderInterface
+{
+    /**
+     * @var GetPaymentNonceCommand
+     */
+    private $getPaymentNonceCommand;
+
+    /**
+     * PaymentAdditionalInformationProvider constructor.
+     * @param GetPaymentNonceCommand $getPaymentNonceCommand
+     */
+    public function __construct(GetPaymentNonceCommand $getPaymentNonceCommand)
+    {
+        $this->getPaymentNonceCommand = $getPaymentNonceCommand;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAdditionalInformation(PaymentTokenInterface $paymentToken): array
+    {
+        $paymentMethodNonce = $this->getPaymentNonceCommand->execute([
+            PaymentTokenInterface::CUSTOMER_ID => $paymentToken->getCustomerId(),
+            PaymentTokenInterface::PUBLIC_HASH => $paymentToken->getPublicHash(),
+        ])->get()['paymentMethodNonce'];
+
+        return [
+            'payment_method_nonce' => $paymentMethodNonce,
+        ];
+    }
+}

app/code/Magento/Braintree/composer.json

@@ -15,6 +15,7 @@
         "magento/module-config": "100.3.*",
         "magento/module-customer": "100.3.*",
         "magento/module-directory": "100.3.*",
+        "magento/module-instant-purchase": "100.3.*",
         "magento/module-payment": "100.3.*",
         "magento/module-paypal": "100.3.*",
         "magento/module-quote": "100.3.*",

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

@@ -71,11 +71,21 @@
             <braintree_cc_vault>
                 <model>BraintreeCreditCardVaultFacade</model>
                 <title>Stored Cards (Braintree)</title>
+                <instant_purchase>
+                    <available>Magento\Braintree\Model\InstantPurchase\CreditCard\AvailabilityChecker</available>
+                    <tokenFormat>Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter</tokenFormat>
+                    <additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
+                </instant_purchase>
             </braintree_cc_vault>
             <braintree_paypal_vault>
                 <model>BraintreePayPalVaultFacade</model>
                 <title>Stored Accounts (Braintree PayPal)</title>
                 <can_use_internal>1</can_use_internal>
+                <instant_purchase>
+                    <available>Magento\Braintree\Model\InstantPurchase\CreditCard\AvailabilityChecker</available>
+                    <tokenFormat>Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter</tokenFormat>
+                    <additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
+                </instant_purchase>
             </braintree_paypal_vault>
         </payment>
     </default>

app/code/Magento/Catalog/Model/ImageExtractor.php

@@ -5,10 +5,11 @@
  */
 namespace Magento\Catalog\Model;
 
-use Magento\Catalog\Model\Product\Attribute\Backend\Media\ImageEntryConverter;
 use Magento\Catalog\Helper\Image;
+use Magento\Catalog\Model\Product\Attribute\Backend\Media\ImageEntryConverter;
+use Magento\Framework\View\Xsd\Media\TypeDataExtractorInterface;
 
-class ImageExtractor implements \Magento\Framework\View\Xsd\Media\TypeDataExtractorInterface
+class ImageExtractor implements TypeDataExtractorInterface
 {
     /**
      * Extract configuration data of images from the DOM structure
@@ -30,8 +31,11 @@ public function process(\DOMElement $mediaNode, $mediaParentTag)
                 if ($attribute->nodeType != XML_ELEMENT_NODE) {
                     continue;
                 }
-                if ($attribute->tagName == 'background') {
+                $attributeTagName = $attribute->tagName;
+                if ($attributeTagName === 'background') {
                     $nodeValue = $this->processImageBackground($attribute->nodeValue);
+                } elseif ($attributeTagName === 'width' || $attributeTagName === 'height') {
+                    $nodeValue = intval($attribute->nodeValue);
                 } else {
                     $nodeValue = $attribute->nodeValue;
                 }
@@ -55,6 +59,7 @@ private function processImageBackground($backgroundString)
         $backgroundArray = [];
         if (preg_match($pattern, $backgroundString, $backgroundArray)) {
             array_shift($backgroundArray);
+            $backgroundArray = array_map('intval', $backgroundArray);
         }
         return $backgroundArray;
     }