From 66e63e010af38399b7b5a4ad81a665d84d7e830d Mon Sep 17 00:00:00 2001
From: Simon Sippert <simon.sippert@gmx.de>
Date: Mon, 28 Jun 2021 11:48:46 +0200
Subject: [PATCH 01/87] Remove casting to int on increment ID which can be
 prefixed by a string

---
 .../Sales/view/frontend/templates/order/print/invoice.phtml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
index 3c0196d59329c..e87a8578052b5 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
@@ -14,7 +14,7 @@
 <?php foreach ($_invoices as $_invoice) : ?>
 <div class="order-details-items invoice">
     <div class="order-title">
-        <strong><?= $block->escapeHtml(__('Invoice #')) ?><?= (int) $_invoice->getIncrementId() ?></strong>
+        <strong><?= $block->escapeHtml(__('Invoice #')) ?><?= $_invoice->getIncrementId() ?></strong>
     </div>
     <div class="table-wrapper table-order-items invoice">
         <table class="data table table-order-items invoice" id="my-invoice-table-<?= (int) $_invoice->getId() ?>">

From 16ef8b1e28bd92f3ee086d8181c398cc47a45207 Mon Sep 17 00:00:00 2001
From: Jakub Winkler <jakub@qsolutionsstudio.com>
Date: Thu, 15 Jul 2021 10:40:45 +0200
Subject: [PATCH 02/87] #33486 issue bug-fix

---
 app/code/Magento/Eav/Model/Entity/Attribute.php               | 2 +-
 app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index 04175c2da94d1..e24787bb0056f 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -356,12 +356,12 @@ public function getBackendTypeByInput($type)
             case 'text':
             case 'gallery':
             case 'media_image':
-            case 'multiselect':
                 $field = 'varchar';
                 break;
 
             case 'image':
             case 'textarea':
+            case 'multiselect':
                 $field = 'text';
                 break;
 
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php
index 476f458d25f8e..549ca7cf982e8 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php
@@ -62,7 +62,7 @@ public static function dataGetBackendTypeByInput()
             ['text', 'varchar'],
             ['gallery', 'varchar'],
             ['media_image', 'varchar'],
-            ['multiselect', 'varchar'],
+            ['multiselect', 'text'],
             ['image', 'text'],
             ['textarea', 'text'],
             ['date', 'datetime'],

From 2be10b7f4aeb1779356fafbd65ad1c8d2d95dd58 Mon Sep 17 00:00:00 2001
From: Jakub Winkler <jakub@qsolutionsstudio.com>
Date: Sun, 18 Jul 2021 12:23:00 +0200
Subject: [PATCH 03/87] #bug-33486 - fixing integration tests for multiselect
 attributes stores in _text entity table

---
 .../Catalog/Model/ProductGettersTest.php      | 26 ++++++++++++++++---
 .../Catalog/_files/multiselect_attribute.php  | 25 +++++++++---------
 .../multiselect_attribute_with_html.php       |  2 +-
 ...select_attribute_with_incorrect_values.php |  2 +-
 ...ultiselect_attribute_with_source_model.php |  2 +-
 .../products_with_multiselect_attribute.php   | 14 ++++++++++
 .../Model/Adapter/ElasticsearchTest.php       |  2 +-
 .../_files/multiselect_attribute.php          |  2 +-
 .../Search/_files/filterable_attribute.php    |  2 +-
 .../order_address_with_multi_attribute.php    |  2 +-
 10 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php
index 12eefd8f59b60..2ce4a4f8876ec 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php
@@ -215,9 +215,9 @@ public function testGetAttributeTextArray()
         $product = $this->productRepository->get('simple_ms_2');
         $product->getAttributeText('multiselect_attribute');
         $expected = [
-            'Option 2',
-            'Option 3',
-            'Option 4 "!@#$%^&*'
+            'Multiselect option 2',
+            'Multiselect option 3',
+            'Multiselect option 4'
         ];
         self::assertEquals(
             $expected,
@@ -225,6 +225,26 @@ public function testGetAttributeTextArray()
         );
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/products_with_multiselect_attribute.php
+     */
+    public function testMultipleMultiselectValues()
+    {
+        $expectedArray = [];
+
+        for ($i = 1; $i < 200; $i++) {
+            $expectedArray[] = sprintf('Multiselect option %d', $i);
+        }
+
+        $product = $this->productRepository->get('simple_ms_3');
+
+        self::assertEquals(
+            $expectedArray,
+            $product->getAttributeText('multiselect_attribute')
+        );
+    }
+
+
     public function testGetCustomDesignDate()
     {
         $this->assertEquals(['from' => null, 'to' => null], $this->_model->getCustomDesignDate());
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute.php
index 7dacdc42463a9..1425a2f60ebde 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute.php
@@ -12,6 +12,15 @@
 $attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
 );
+
+$valueOptionArray = [];
+$orderArray = [];
+
+for ($i = 1; $i < 200; $i++) {
+    $valueOptionArray[sprintf('option_%d', $i)] = [sprintf('Multiselect option %d', $i)];
+    $orderArray[sprintf('option_%d', $i)] = $i;
+}
+
 $entityType = $installer->getEntityTypeId('catalog_product');
 if (!$attribute->loadByCode($entityType, 'multiselect_attribute')->getAttributeId()) {
     $attribute->setData(
@@ -34,21 +43,11 @@
             'used_in_product_listing' => 0,
             'used_for_sort_by' => 0,
             'frontend_label' => ['Multiselect Attribute'],
-            'backend_type' => 'varchar',
+            'backend_type' => 'text',
             'backend_model' => \Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend::class,
             'option' => [
-                'value' => [
-                    'option_1' => ['Option 1'],
-                    'option_2' => ['Option 2'],
-                    'option_3' => ['Option 3'],
-                    'option_4' => ['Option 4 "!@#$%^&*']
-                ],
-                'order' => [
-                    'option_1' => 1,
-                    'option_2' => 2,
-                    'option_3' => 3,
-                    'option_4' => 4,
-                ],
+                'value' => $valueOptionArray,
+                'order' => $orderArray
             ],
         ]
     );
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_html.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_html.php
index bb2bb5016b426..de68fc9351eca 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_html.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_html.php
@@ -41,7 +41,7 @@
             'used_in_product_listing' => 0,
             'used_for_sort_by' => 0,
             'frontend_label' => ['Multiselect Attribute'],
-            'backend_type' => 'varchar',
+            'backend_type' => 'text',
             'backend_model' => ArrayBackend::class,
             'option' => [
                 'value' => [
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_incorrect_values.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_incorrect_values.php
index 5e32afbcd9027..a73c30eba6a34 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_incorrect_values.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_incorrect_values.php
@@ -33,7 +33,7 @@
         'used_in_product_listing' => 0,
         'used_for_sort_by' => 0,
         'frontend_label' => ['Multiselect Attribute'],
-        'backend_type' => 'varchar',
+        'backend_type' => 'text',
         'backend_model' => \Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend::class,
         'option' => [
             'value' => [
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_source_model.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_source_model.php
index 6dcba90bf44fa..7909b4cc8a88a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_source_model.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_with_source_model.php
@@ -34,7 +34,7 @@
             'used_in_product_listing' => 0,
             'used_for_sort_by' => 0,
             'frontend_label' => ['Multiselect Attribute with Source Model'],
-            'backend_type' => 'varchar',
+            'backend_type' => 'text',
             'backend_model' => \Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend::class,
             'source_model' => \Magento\Catalog\_files\MultiselectSourceMock::class
         ]
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute.php
index 5131cfc47b85b..9904f18edfbc4 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute.php
@@ -54,3 +54,17 @@
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->save();
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId($optionIds[2] * 10)
+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
+    ->setWebsiteIds([1])
+    ->setName('With Multiselect 3')
+    ->setSku('simple_ms_3')
+    ->setPrice(10)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setMultiselectAttribute(array_values($optionIds))
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Adapter/ElasticsearchTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Adapter/ElasticsearchTest.php
index 986d98f0f2f14..9d96a5b860631 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Adapter/ElasticsearchTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Adapter/ElasticsearchTest.php
@@ -140,7 +140,7 @@ public function createNewAttribute(): void
                 'used_in_product_listing' => 0,
                 'used_for_sort_by' => 0,
                 'frontend_label' => ['Multiselect Attribute'],
-                'backend_type' => 'varchar',
+                'backend_type' => 'text',
                 'backend_model' => ArrayBackend::class,
                 'option' => [
                     'value' => [
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/multiselect_attribute.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/multiselect_attribute.php
index 0f47445323092..b9a1771c2ffd2 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/multiselect_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/multiselect_attribute.php
@@ -34,7 +34,7 @@
         'used_in_product_listing' => 0,
         'used_for_sort_by' => 0,
         'frontend_label' => ['Multiselect Attribute'],
-        'backend_type' => 'varchar',
+        'backend_type' => 'text',
         'backend_model' => \Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend::class,
         'option' => [
             'value' => [
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attribute.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attribute.php
index a74669e9890af..42b68cf02fe0c 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attribute.php
@@ -54,7 +54,7 @@
             'value' => ['option_0' => ['Option 1'], 'option_1' => ['Option 2']],
             'order' => ['option_0' => 1, 'option_1' => 2],
         ],
-        'backend_type' => 'varchar',
+        'backend_type' => 'text',
     ]
 );
 $multiselectAttribute->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_address_with_multi_attribute.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_address_with_multi_attribute.php
index be454aef872a8..a079a2ca3a515 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_address_with_multi_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_address_with_multi_attribute.php
@@ -40,7 +40,7 @@
             'frontend_input' => 'multiselect',
             'frontend_label' => ['Multiselect Attribute'],
             'sort_order' => '0',
-            'backend_type' => 'varchar',
+            'backend_type' => 'text',
             'is_user_defined' => 1,
             'is_system' => 0,
             'is_required' => '0',

From b53d2afcf6c23e3679729bc0f5c3ac4d81d2844b Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <svizev.igor@gmail.com>
Date: Wed, 4 Aug 2021 16:21:29 +0300
Subject: [PATCH 04/87] Optimize QuoteIdToMaskedQuoteId model and fix infinite
 loop

---
 .../Quote/Model/QuoteIdToMaskedQuoteId.php    | 44 +++++++++++--------
 .../Quote/Model/ResourceModel/Quote.php       | 22 ++++++++++
 .../Model/ResourceModel/Quote/QuoteIdMask.php | 23 ++++++++++
 3 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php b/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php
index 2e802f47cfefe..8d1e002a832fa 100644
--- a/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php
+++ b/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteId.php
@@ -7,7 +7,10 @@
 
 namespace Magento\Quote\Model;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\Quote\Model\ResourceModel\Quote\QuoteIdMask as QuoteIdMaskResource;
 
 /**
@@ -16,32 +19,31 @@
 class QuoteIdToMaskedQuoteId implements QuoteIdToMaskedQuoteIdInterface
 {
     /**
-     * @var QuoteIdMaskFactory
-     */
-    private $quoteIdMaskFactory;
-    /**
-     * @var CartRepositoryInterface
+     * @var QuoteIdMaskResource
      */
-    private $cartRepository;
+    private $quoteIdMaskResource;
 
     /**
-     * @var QuoteIdMaskResource
+     * @var QuoteResource
      */
-    private $quoteIdMaskResource;
+    private $quoteResource;
 
     /**
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
      * @param CartRepositoryInterface $cartRepository
      * @param QuoteIdMaskResource $quoteIdMaskResource
+     * @param QuoteResource|null $quoteResourceModel
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         QuoteIdMaskFactory $quoteIdMaskFactory,
         CartRepositoryInterface $cartRepository,
-        QuoteIdMaskResource $quoteIdMaskResource
+        QuoteIdMaskResource $quoteIdMaskResource,
+        QuoteResource $quoteResourceModel = null
     ) {
-        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
-        $this->cartRepository = $cartRepository;
         $this->quoteIdMaskResource = $quoteIdMaskResource;
+        $this->quoteResource = $quoteResourceModel ?? ObjectManager::getInstance()->get(QuoteResource::class);
     }
 
     /**
@@ -49,13 +51,19 @@ public function __construct(
      */
     public function execute(int $quoteId): string
     {
-        /* Check the quote exists to avoid database constraint issues */
-        $this->cartRepository->get($quoteId);
-
-        $quoteIdMask = $this->quoteIdMaskFactory->create();
-        $this->quoteIdMaskResource->load($quoteIdMask, $quoteId, 'quote_id');
-        $maskedId = $quoteIdMask->getMaskedId() ?? '';
+        // Check the quote exists to avoid database constraint issues
+        if (!$this->quoteResource->isExists($quoteId)) {
+            throw new NoSuchEntityException(
+                __(
+                    'No such entity with %fieldName = %fieldValue',
+                    [
+                        'fieldName' => 'quoteId',
+                        'fieldValue' => $quoteId
+                    ]
+                )
+            );
+        }
 
-        return $maskedId;
+        return (string)$this->quoteIdMaskResource->getMaskedQuoteId($quoteId);
     }
 }
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote.php b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
index e6350dd5aeb2b..59eb446903b89 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
@@ -316,4 +316,26 @@ public function save(\Magento\Framework\Model\AbstractModel $object)
 
         return $this;
     }
+
+    /**
+     * Quickly check if quote exists
+     *
+     * Uses direct DB query due to performance reasons
+     *
+     * @param int $quoteId
+     * @return bool
+     */
+    public function isExists(int $quoteId): bool
+    {
+        $connection = $this->getConnection();
+        $mainTable = $this->getMainTable();
+        $idFieldName = $this->getIdFieldName();
+
+        $field = $connection->quoteIdentifier(sprintf('%s.%s', $mainTable, $idFieldName));
+        $select = $connection->select()
+            ->from($mainTable, [$idFieldName])
+            ->where($field . '=?', $quoteId);
+
+        return (bool)$connection->fetchOne($select);
+    }
 }
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/QuoteIdMask.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/QuoteIdMask.php
index d40cf525e8659..5f9c4febd23ff 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/QuoteIdMask.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/QuoteIdMask.php
@@ -22,4 +22,27 @@ protected function _construct()
     {
         $this->_init('quote_id_mask', 'entity_id');
     }
+
+    /**
+     * Retrieves masked quote id
+     *
+     * Uses direct DB query due to performance reasons
+     *
+     * @param int $quoteId
+     * @return string|null
+     */
+    public function getMaskedQuoteId(int $quoteId): ?string
+    {
+        $connection = $this->getConnection();
+        $mainTable = $this->getMainTable();
+        $field = $connection->quoteIdentifier(sprintf('%s.%s', $mainTable, 'quote_id'));
+
+        $select = $connection->select()
+            ->from($mainTable, ['masked_id'])
+            ->where($field . '=?', $quoteId);
+
+        $result = $connection->fetchOne($select);
+
+        return $result ?: null;
+    }
 }

From 8864695fc72c52a6a585685c38cd3691028c39d2 Mon Sep 17 00:00:00 2001
From: Simon Sippert <simon.sippert@gmx.de>
Date: Fri, 27 Aug 2021 17:18:47 +0200
Subject: [PATCH 05/87] Add escaping to increment ID

Co-authored-by: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
---
 .../Sales/view/frontend/templates/order/print/invoice.phtml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
index e87a8578052b5..c4dfa88eacfaa 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
@@ -14,7 +14,7 @@
 <?php foreach ($_invoices as $_invoice) : ?>
 <div class="order-details-items invoice">
     <div class="order-title">
-        <strong><?= $block->escapeHtml(__('Invoice #')) ?><?= $_invoice->getIncrementId() ?></strong>
+        <strong><?= $block->escapeHtml(__('Invoice #')) ?><?= $block->escapeHtml($_invoice->getIncrementId()) ?></strong>
     </div>
     <div class="table-wrapper table-order-items invoice">
         <table class="data table table-order-items invoice" id="my-invoice-table-<?= (int) $_invoice->getId() ?>">

From 3f289196cf35559249ca0f60cebe52c678fbb303 Mon Sep 17 00:00:00 2001
From: Lyra Ghost <LyraGhost@users.noreply.github.com>
Date: Mon, 30 Aug 2021 12:15:32 -0400
Subject: [PATCH 06/87] Fix active state on multiselect crumb

---
 .../web/css/source/actions/_actions-multiselect.less       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
index 96a607346fbe8..036b956c79897 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
@@ -285,10 +285,15 @@
             }
 
             &:active {
+                padding: 0;
                 transform: scale(.9);
+                
+                &:before {
+                    font-size: 1em;
+                }
             }
 
-            &:before {
+            &:before{
                 font-size: 1em;
             }
         }

From 041a247b658478521373050a5c5b29680f73bbf5 Mon Sep 17 00:00:00 2001
From: Lyra Ghost <LyraGhost@users.noreply.github.com>
Date: Mon, 30 Aug 2021 12:19:26 -0400
Subject: [PATCH 07/87] Fix whitespace

---
 .../backend/web/css/source/actions/_actions-multiselect.less    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
index 036b956c79897..16cfe206f3e75 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
@@ -293,7 +293,7 @@
                 }
             }
 
-            &:before{
+            &:before {
                 font-size: 1em;
             }
         }

From 8d77e8bc58b000d60e2aacfee9fc01c34d0151a4 Mon Sep 17 00:00:00 2001
From: Simon Sippert <s.sippert@techdivision.com>
Date: Wed, 1 Sep 2021 11:05:00 +0200
Subject: [PATCH 08/87] Fix integration test

---
 .../Magento/Sales/Block/Order/PrintOrder/InvoiceTest.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Order/PrintOrder/InvoiceTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Order/PrintOrder/InvoiceTest.php
index 5bdd9aa0f3d1c..768bf1e9feac7 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Order/PrintOrder/InvoiceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Order/PrintOrder/InvoiceTest.php
@@ -125,11 +125,11 @@ public function testPrintInvoice(): void
             Xpath::getElementsCountForXpath(
                 sprintf(
                     "//div[contains(@class, 'order-title')]/strong[contains(text(), '%s')]",
-                    __('Invoice #%1', (int)$invoice->getIncrementId())
+                    __('Invoice #%1', $invoice->getIncrementId())
                 ),
                 $blockHtml
             ),
-            sprintf('Title for %s was not found.', __('Invoice #%1', (int)$invoice->getIncrementId()))
+            sprintf('Title for %s was not found.', __('Invoice #%1', $invoice->getIncrementId()))
         );
         $this->assertOrderInformation($order, $blockHtml);
     }

From 61adcaa86e00e9efe2d7822c041c4c00e09531e7 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Thu, 2 Sep 2021 00:17:36 +0300
Subject: [PATCH 09/87] Remove casting to int on increment ID which can be
 prefixed by a string

Add test coverage
---
 .../Block/Order/PrintOrder/InvoiceTest.php    | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Order/PrintOrder/InvoiceTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Order/PrintOrder/InvoiceTest.php
index 768bf1e9feac7..adad0757f34b6 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Order/PrintOrder/InvoiceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Order/PrintOrder/InvoiceTest.php
@@ -117,6 +117,37 @@ public function testPrintInvoice(): void
         $order = $this->orderFactory->create()->loadByIncrementId('100000555');
         $invoice = $order->getInvoiceCollection()->getFirstItem();
         $this->assertNotNull($invoice->getId());
+        $this->assertTrue(is_numeric($invoice->getIncrementId()));
+        $this->registerOrder($order);
+        $this->registerInvoice($invoice);
+        $blockHtml = $this->renderPrintInvoiceBlock();
+        $this->assertEquals(
+            1,
+            Xpath::getElementsCountForXpath(
+                sprintf(
+                    "//div[contains(@class, 'order-title')]/strong[contains(text(), '%s')]",
+                    __('Invoice #%1', $invoice->getIncrementId())
+                ),
+                $blockHtml
+            ),
+            sprintf('Title for %s was not found.', __('Invoice #%1', $invoice->getIncrementId()))
+        );
+        $this->assertOrderInformation($order, $blockHtml);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/invoices_for_items.php
+     *
+     * @return void
+     */
+    public function testPrintInvoiceWithStringPrefix(): void
+    {
+        $order = $this->orderFactory->create()->loadByIncrementId('100000555');
+        $invoice = $order->getInvoiceCollection()->getFirstItem();
+        $this->assertNotNull($invoice->getId());
+        // set text prefix to increment id
+        $invoice->setIncrementId('prefix-' . $invoice->getIncrementId());
+        $this->assertFalse(is_numeric($invoice->getIncrementId()));
         $this->registerOrder($order);
         $this->registerInvoice($invoice);
         $blockHtml = $this->renderPrintInvoiceBlock();

From ef76b7e2b885da45cb37641ba9fe3ef27c68f422 Mon Sep 17 00:00:00 2001
From: Teun Lassche <contact@thlassche.nl>
Date: Mon, 6 Sep 2021 09:46:21 +0200
Subject: [PATCH 10/87] Cache subsequent glob  calls

---
 lib/internal/Magento/Framework/Filesystem/Glob.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/internal/Magento/Framework/Filesystem/Glob.php b/lib/internal/Magento/Framework/Filesystem/Glob.php
index 9d8de333e35fa..02af8790ffdc3 100644
--- a/lib/internal/Magento/Framework/Filesystem/Glob.php
+++ b/lib/internal/Magento/Framework/Filesystem/Glob.php
@@ -14,6 +14,7 @@
  */
 class Glob extends LaminasGlob
 {
+    protected static $cache = [];
     /**
      * Find pathnames matching a pattern.
      *
@@ -24,11 +25,16 @@ class Glob extends LaminasGlob
      */
     public static function glob($pattern, $flags = 0, $forceFallback = false)
     {
+        $key = $pattern . '|' . $flags . '|' . ($forceFallback ? 1 : 0);
+        if (isset(self::$cache[$key])) {
+            return self::$cache[$key];
+        }
         try {
             $result = LaminasGlob::glob($pattern, $flags, $forceFallback);
         } catch (LaminasRuntimeException $e) {
             $result = [];
         }
+        self::$cache[$key] = $result;
         return $result;
     }
 }

From a06fcadce841ee46ec1d05d0055ef6f1d6a2730c Mon Sep 17 00:00:00 2001
From: Teun Lassche <contact@thlassche.nl>
Date: Mon, 6 Sep 2021 10:18:05 +0200
Subject: [PATCH 11/87] Make glob cache property private

Co-authored-by: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
---
 lib/internal/Magento/Framework/Filesystem/Glob.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Filesystem/Glob.php b/lib/internal/Magento/Framework/Filesystem/Glob.php
index 02af8790ffdc3..d43ce1ba244df 100644
--- a/lib/internal/Magento/Framework/Filesystem/Glob.php
+++ b/lib/internal/Magento/Framework/Filesystem/Glob.php
@@ -14,7 +14,7 @@
  */
 class Glob extends LaminasGlob
 {
-    protected static $cache = [];
+    private static $cache = [];
     /**
      * Find pathnames matching a pattern.
      *

From 82f040f3f17da08d6af0d51c0f5ed33abd94d040 Mon Sep 17 00:00:00 2001
From: Jakub Winkler <jakub@qsolutionsstudio.com>
Date: Sat, 18 Sep 2021 14:48:23 +0200
Subject: [PATCH 12/87] #33486 - fixing tests and applying code changes to
 indexes and attributes

---
 .../Product/Indexer/Eav/Source.php            |   6 +-
 ...pdateMultiselectAttributesBackendTypes.php | 103 ++++++++++++++++++
 .../Model/Rule/Condition/Product.php          |   2 +-
 .../Attribute/DataProvider/MultipleSelect.php |   2 +-
 .../Catalog/Model/ProductGettersTest.php      |  12 +-
 .../Product/Indexer/Eav/SourceTest.php        |  18 ++-
 .../Catalog/_files/multiselect_attribute.php  |  64 ++++++++++-
 .../_files/multiselect_attribute_rollback.php |   3 +
 .../products_with_multiselect_attribute.php   |  36 ++++--
 9 files changed, 208 insertions(+), 38 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Setup/Patch/Data/UpdateMultiselectAttributesBackendTypes.php

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
index e625e38b59f31..b32c34678fe20 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
@@ -105,7 +105,7 @@ protected function _getIndexableAttributes($multiSelect)
         );
 
         if ($multiSelect == true) {
-            $select->where('ea.backend_type = ?', 'varchar')->where('ea.frontend_input = ?', 'multiselect');
+            $select->where('ea.backend_type = ?', 'text')->where('ea.frontend_input = ?', 'multiselect');
         } else {
             $select->where('ea.backend_type = ?', 'int')->where('ea.frontend_input IN( ? )', ['select', 'boolean']);
         }
@@ -303,14 +303,14 @@ protected function _prepareMultiselectIndex($entityIds = null, $attributeId = nu
         // prepare get multiselect values query
         $productValueExpression = $connection->getCheckSql('pvs.value_id > 0', 'pvs.value', 'pvd.value');
         $select = $connection->select()->from(
-            ['pvd' => $this->getTable('catalog_product_entity_varchar')],
+            ['pvd' => $this->getTable('catalog_product_entity_text')],
             []
         )->join(
             ['cs' => $this->getTable('store')],
             '',
             []
         )->joinLeft(
-            ['pvs' => $this->getTable('catalog_product_entity_varchar')],
+            ['pvs' => $this->getTable('catalog_product_entity_text')],
             "pvs.{$productIdField} = pvd.{$productIdField} AND pvs.attribute_id = pvd.attribute_id"
             . ' AND pvs.store_id=cs.store_id',
             []
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateMultiselectAttributesBackendTypes.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateMultiselectAttributesBackendTypes.php
new file mode 100644
index 0000000000000..06ffb40a7a1f2
--- /dev/null
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateMultiselectAttributesBackendTypes.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Setup\Patch\Data;
+
+use Magento\Catalog\Model\Product;
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+
+class UpdateMultiselectAttributesBackendTypes implements DataPatchInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $dataSetup;
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * MigrateMultiselectAttributesData constructor.
+     * @param ModuleDataSetupInterface $dataSetup
+     * @param EavSetupFactory $eavSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $dataSetup,
+        EavSetupFactory $eavSetupFactory
+    ) {
+        $this->dataSetup = $dataSetup;
+        $this->eavSetupFactory = $eavSetupFactory;
+    }
+
+    /**
+     * @return array
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @return UpdateMultiselectAttributesBackendTypes
+     * @throws LocalizedException
+     */
+    public function apply()
+    {
+        $this->dataSetup->startSetup();
+
+        $connection = $this->dataSetup->getConnection();
+        $attributeTable = $connection->getTableName('eav_attribute');
+        /** @var EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->dataSetup]);
+        $entityTypeId = $eavSetup->getEntityTypeId(Product::ENTITY);
+        $attributesToMigrate = $connection->fetchCol(
+            $connection
+                ->select()
+                ->from($attributeTable, ['attribute_id'])
+                ->where('entity_type_id = ?', $entityTypeId)
+                ->where('backend_type = ?', 'varchar')
+                ->where('frontend_input = ?', 'multiselect')
+        );
+
+        $varcharTable = $connection->getTableName('catalog_product_entity_varchar');
+        $textTable = $connection->getTableName('catalog_product_entity_text');
+        $varcharTableDataSql = $connection
+            ->select()
+            ->from($varcharTable)
+            ->where('attribute_id in (?)', $attributesToMigrate);
+        $dataToMigrate = array_map(static function ($row) {
+            $row['value_id'] = null;
+            return $row;
+        }, $connection->fetchAll($varcharTableDataSql));
+
+        foreach (array_chunk($dataToMigrate, 2000) as $dataChunk) {
+            $connection->insertMultiple($textTable, $dataChunk);
+        }
+
+        $connection->query($connection->deleteFromSelect($varcharTableDataSql, $varcharTable));
+
+        foreach ($attributesToMigrate as $attributeId) {
+            $eavSetup->updateAttribute($entityTypeId, $attributeId, 'backend_type', 'text');
+        }
+
+        $this->dataSetup->endSetup();
+
+        return $this;
+    }
+}
diff --git a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
index e4bb0a8a66b0f..ce6cac82806ab 100644
--- a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
@@ -182,7 +182,7 @@ protected function addGlobalAttribute(
                 $linkField = $attribute->getEntity()->getLinkField();
 
                 $collection->getSelect()->join(
-                    [$alias => $collection->getTable('catalog_product_entity_varchar')],
+                    [$alias => $collection->getTable($attribute->getBackendTable())],
                     "($alias.$linkField = e.$linkField) AND ($alias.store_id = $storeId)" .
                     " AND ($alias.attribute_id = {$attribute->getId()})",
                     []
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/MultipleSelect.php b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/MultipleSelect.php
index 4d72f5b316ea0..fc6cea3a986ae 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/MultipleSelect.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/MultipleSelect.php
@@ -89,7 +89,7 @@ protected function getUpdateExpectedData(): array
                 'frontend_class' => null,
                 'used_for_sort_by' => '0',
                 'is_user_defined' => '1',
-                'backend_type' => 'varchar',
+                'backend_type' => 'text',
             ]
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php
index 2ce4a4f8876ec..9996ac4836831 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php
@@ -207,6 +207,7 @@ public function testGetAttributeText()
         $this->assertEquals('Enabled', $this->_model->getAttributeText('status'));
     }
 
+
     /**
      * @magentoDataFixture Magento/Catalog/_files/products_with_multiselect_attribute.php
      */
@@ -215,9 +216,9 @@ public function testGetAttributeTextArray()
         $product = $this->productRepository->get('simple_ms_2');
         $product->getAttributeText('multiselect_attribute');
         $expected = [
-            'Multiselect option 2',
-            'Multiselect option 3',
-            'Multiselect option 4'
+            'Option 2',
+            'Option 3',
+            'Option 4 "!@#$%^&*'
         ];
         self::assertEquals(
             $expected,
@@ -225,10 +226,11 @@ public function testGetAttributeTextArray()
         );
     }
 
+
     /**
      * @magentoDataFixture Magento/Catalog/_files/products_with_multiselect_attribute.php
      */
-    public function testMultipleMultiselectValues()
+    public function testMultipleMultiselectTextValues()
     {
         $expectedArray = [];
 
@@ -240,7 +242,7 @@ public function testMultipleMultiselectValues()
 
         self::assertEquals(
             $expectedArray,
-            $product->getAttributeText('multiselect_attribute')
+            $product->getAttributeText('multiselect_attribute_text')
         );
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
index 6ecfdbe567c07..b9460d950338c 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
@@ -138,26 +138,23 @@ public function testReindexMultiselectAttribute()
         /** @var $options \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection */
         $options = $objectManager->create(\Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection::class);
         $options->setAttributeFilter($attr->getId());
-        $optionIds = $options->getAllIds();
-        $product1Id = $optionIds[0] * 10;
-        $product2Id = $optionIds[1] * 10;
 
         /** @var \Magento\Catalog\Model\Product $product1 **/
-        $product1 = $productRepository->getById($product1Id);
+        $product1 = $productRepository->get('simple_ms_1');
         $product1->setSpecialFromDate(date('Y-m-d H:i:s'));
         $product1->setNewsFromDate(date('Y-m-d H:i:s'));
         $productRepository->save($product1);
 
         /** @var \Magento\Catalog\Model\Product $product2 **/
-        $product2 = $productRepository->getById($product2Id);
-        $product1->setSpecialFromDate(date('Y-m-d H:i:s'));
-        $product1->setNewsFromDate(date('Y-m-d H:i:s'));
+        $product2 = $productRepository->get('simple_ms_2');
+        $product2->setSpecialFromDate(date('Y-m-d H:i:s'));
+        $product2->setNewsFromDate(date('Y-m-d H:i:s'));
         $productRepository->save($product2);
 
         $this->_eavIndexerProcessor->reindexAll();
         $connection = $this->productResource->getConnection();
         $select = $connection->select()->from($this->productResource->getTable('catalog_product_index_eav'))
-            ->where('entity_id in (?)', [$product1Id, $product2Id])
+            ->where('entity_id in (?)', [$product1->getId(), $product2->getId()])
             ->where('attribute_id = ?', $attr->getId());
 
         $result = $connection->fetchAll($select);
@@ -219,6 +216,7 @@ public function testReindexMultiselectAttributeWithSourceModel()
         $sourceModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             MultiselectSourceMock::class
         );
+
         $options = $sourceModel->getAllOptions();
         $product1Id = $options[0]['value'] * 10;
         $product2Id = $options[1]['value'] * 10;
@@ -231,8 +229,8 @@ public function testReindexMultiselectAttributeWithSourceModel()
 
         /** @var \Magento\Catalog\Model\Product $product2 **/
         $product2 = $productRepository->getById($product2Id);
-        $product1->setSpecialFromDate(date('Y-m-d H:i:s'));
-        $product1->setNewsFromDate(date('Y-m-d H:i:s'));
+        $product2->setSpecialFromDate(date('Y-m-d H:i:s'));
+        $product2->setNewsFromDate(date('Y-m-d H:i:s'));
         $productRepository->save($product2);
 
         $this->_eavIndexerProcessor->reindexAll();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute.php
index 1425a2f60ebde..e308d764e1f6b 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute.php
@@ -8,8 +8,13 @@
 $installer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Catalog\Setup\CategorySetup::class
 );
-/** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
-$attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+/** @var $attributeMultiselect \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+$attributeMultiselect = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+);
+
+/** @var $attributeMultiselectText \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+$attributeMultiselectText = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
 );
 
@@ -22,12 +27,59 @@
 }
 
 $entityType = $installer->getEntityTypeId('catalog_product');
-if (!$attribute->loadByCode($entityType, 'multiselect_attribute')->getAttributeId()) {
-    $attribute->setData(
+if (!$attributeMultiselect->loadByCode($entityType, 'multiselect_attribute')->getAttributeId()) {
+    $attributeMultiselect->setData(
         [
             'attribute_code' => 'multiselect_attribute',
             'entity_type_id' => $entityType,
             'is_global' => 1,
+            'is_user_defined' => 1,
+            'frontend_input' => 'multiselect',
+            'is_unique' => 0,
+            'is_required' => 0,
+            'is_searchable' => 0,
+            'is_visible_in_advanced_search' => 0,
+            'is_comparable' => 0,
+            'is_filterable' => 1,
+            'is_filterable_in_search' => 0,
+            'is_used_for_promo_rules' => 0,
+            'is_html_allowed_on_front' => 1,
+            'is_visible_on_front' => 0,
+            'used_in_product_listing' => 0,
+            'used_for_sort_by' => 0,
+            'frontend_label' => ['Multiselect Attribute'],
+            'backend_type' => 'text',
+            'backend_model' => \Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend::class,
+            'option' => [
+                'value' => [
+                    'option_1' => ['Option 1'],
+                    'option_2' => ['Option 2'],
+                    'option_3' => ['Option 3'],
+                    'option_4' => ['Option 4 "!@#$%^&*']
+                ],
+                'order' => [
+                    'option_1' => 1,
+                    'option_2' => 2,
+                    'option_3' => 3,
+                    'option_4' => 4,
+                ],
+            ],
+        ]
+    );
+    $attributeMultiselect->save();
+
+    /* Assign attribute to attribute set */
+    $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attributeMultiselect->getId());
+}
+
+
+if (!$attributeMultiselectText->loadByCode($entityType, 'multiselect_attribute_text')->getAttributeId()) {
+    $attributeMultiselectText->setData(
+        [
+            'attribute_code' => 'multiselect_attribute_text',
+            'entity_type_id' => $entityType,
+            'is_global' => 1,
+
             'is_user_defined' => 1,
             'frontend_input' => 'multiselect',
             'is_unique' => 0,
@@ -51,8 +103,8 @@
             ],
         ]
     );
-    $attribute->save();
+    $attributeMultiselectText->save();
 
     /* Assign attribute to attribute set */
-    $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId());
+    $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attributeMultiselectText->getId());
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_rollback.php
index 9c139c0d4c62d..8ff875b334dc0 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute_rollback.php
@@ -14,5 +14,8 @@
 $attribute->load('multiselect_attribute', 'attribute_code');
 $attribute->delete();
 
+$attribute->load('multiselect_attribute_text', 'attribute_code');
+$attribute->delete();
+
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute.php
index 9904f18edfbc4..8ab595809d338 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute.php
@@ -12,23 +12,35 @@
 
 /** Create product with options and multiselect attribute */
 $eavConfig = Bootstrap::getObjectManager()->get(Config::class);
-$attribute = $eavConfig->getAttribute(Product::ENTITY, 'multiselect_attribute');
+$multiSelectAttribute = $eavConfig->getAttribute(Product::ENTITY, 'multiselect_attribute');
+$multiSelectAttributeText = $eavConfig->getAttribute(Product::ENTITY, 'multiselect_attribute_text');
+
 /** @var $installer \Magento\Catalog\Setup\CategorySetup */
 $installer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Catalog\Setup\CategorySetup::class
 );
 
-/** @var $options \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection */
-$options = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+/** @var $multiSelectAttributeOptions \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection */
+$multiSelectAttributeOptions = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection::class
 );
-$options->setAttributeFilter($attribute->getId());
-$optionIds = $options->getAllIds();
+
+$multiSelectAttributeOptions->setAttributeFilter($multiSelectAttribute->getId());
+$multiSelectAttributeOptionsIds = $multiSelectAttributeOptions->getAllIds();
+
+
+/** @var $multiSelectAttributeOptionsText \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection */
+$multiSelectAttributeOptionsText = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection::class
+);
+
+$multiSelectAttributeOptionsText->setAttributeFilter($multiSelectAttributeText->getId());
+$multiSelectAttributeOptionsTextIds = $multiSelectAttributeOptionsText->getAllIds();
 
 /** @var $product \Magento\Catalog\Model\Product */
 $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
 $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-    ->setId($optionIds[0] * 10)
+    ->setId($multiSelectAttributeOptionsIds[0] * 10)
     ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
     ->setWebsiteIds([1])
     ->setName('With Multiselect 1')
@@ -36,35 +48,35 @@
     ->setPrice(10)
     ->setDescription('Hello " &amp;" Bring the water bottle when you can!')
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-    ->setMultiselectAttribute([$optionIds[0]])
+    ->setMultiselectAttribute([$multiSelectAttributeOptionsIds[0]])
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->save();
 
 $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
 $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-    ->setId($optionIds[1] * 10)
+    ->setId($multiSelectAttributeOptionsIds[1] * 10)
     ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
     ->setWebsiteIds([1])
     ->setName('With Multiselect 2')
     ->setSku('simple_ms_2')
     ->setPrice(10)
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-    ->setMultiselectAttribute([$optionIds[1], $optionIds[2], $optionIds[3]])
+    ->setMultiselectAttribute([$multiSelectAttributeOptionsIds[1], $multiSelectAttributeOptionsIds[2], $multiSelectAttributeOptionsIds[3]])
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->save();
 
 $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
 $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-    ->setId($optionIds[2] * 10)
+    ->setId($multiSelectAttributeOptionsTextIds[2] * 10)
     ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
     ->setWebsiteIds([1])
-    ->setName('With Multiselect 3')
+    ->setName('With Multiselect Text')
     ->setSku('simple_ms_3')
     ->setPrice(10)
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-    ->setMultiselectAttribute(array_values($optionIds))
+    ->setMultiselectAttributeText(array_values($multiSelectAttributeOptionsTextIds))
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->save();

From c78a5a6b02631736b6ef655d0c0c585292adc170 Mon Sep 17 00:00:00 2001
From: Jakub Winkler <jakub@qsolutionsstudio.com>
Date: Sat, 18 Sep 2021 19:04:43 +0200
Subject: [PATCH 13/87] #33486 - final test fix, fixing typo in SourceTest.php
 file

---
 .../Model/ResourceModel/Entity/Attribute.php  |  2 +-
 .../Product/Indexer/Eav/SourceTest.php        | 20 ++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
index 29cad62bf0ca4..7e702baf39b9a 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
@@ -523,7 +523,7 @@ private function clearSelectedOptionInEntities(AbstractModel $object, int $optio
         $where = $connection->quoteInto('attribute_id = ?', $attributeId);
         $update = [];
 
-        if ($object->getBackendType() === 'varchar') {
+        if ($object->getBackendType() === 'text') {
             $where.= ' AND ' . $connection->prepareSqlCondition('value', ['finset' => $optionId]);
             $concat = $connection->getConcatSql(["','", 'value', "','"]);
             $expr = $connection->quoteInto(
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
index b9460d950338c..22579a28f3398 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
@@ -69,7 +69,7 @@ public function testReindexEntitiesForConfigurableProduct()
 
         /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attr **/
         $attr = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class)
-           ->getAttribute('catalog_product', 'test_configurable');
+            ->getAttribute('catalog_product', 'test_configurable');
         $attr->setIsFilterable(1)->save();
 
         $this->_eavIndexerProcessor->reindexAll();
@@ -133,28 +133,31 @@ public function testReindexMultiselectAttribute()
 
         /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attr **/
         $attr = $objectManager->get(\Magento\Eav\Model\Config::class)
-           ->getAttribute('catalog_product', 'multiselect_attribute');
+            ->getAttribute('catalog_product', 'multiselect_attribute');
 
         /** @var $options \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection */
         $options = $objectManager->create(\Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection::class);
         $options->setAttributeFilter($attr->getId());
+        $optionIds = $options->getAllIds();
+        $product1Id = $optionIds[0] * 10;
+        $product2Id = $optionIds[1] * 10;
 
         /** @var \Magento\Catalog\Model\Product $product1 **/
-        $product1 = $productRepository->get('simple_ms_1');
+        $product1 = $productRepository->getById($product1Id);
         $product1->setSpecialFromDate(date('Y-m-d H:i:s'));
         $product1->setNewsFromDate(date('Y-m-d H:i:s'));
         $productRepository->save($product1);
 
         /** @var \Magento\Catalog\Model\Product $product2 **/
-        $product2 = $productRepository->get('simple_ms_2');
-        $product2->setSpecialFromDate(date('Y-m-d H:i:s'));
-        $product2->setNewsFromDate(date('Y-m-d H:i:s'));
+        $product2 = $productRepository->getById($product2Id);
+        $product1->setSpecialFromDate(date('Y-m-d H:i:s'));
+        $product1->setNewsFromDate(date('Y-m-d H:i:s'));
         $productRepository->save($product2);
 
         $this->_eavIndexerProcessor->reindexAll();
         $connection = $this->productResource->getConnection();
         $select = $connection->select()->from($this->productResource->getTable('catalog_product_index_eav'))
-            ->where('entity_id in (?)', [$product1->getId(), $product2->getId()])
+            ->where('entity_id in (?)', [$product1Id, $product2Id])
             ->where('attribute_id = ?', $attr->getId());
 
         $result = $connection->fetchAll($select);
@@ -210,13 +213,12 @@ public function testReindexMultiselectAttributeWithSourceModel()
 
         /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attr **/
         $attr = $objectManager->get(\Magento\Eav\Model\Config::class)
-           ->getAttribute('catalog_product', 'multiselect_attr_with_source');
+            ->getAttribute('catalog_product', 'multiselect_attr_with_source');
 
         /** @var $sourceModel MultiselectSourceMock */
         $sourceModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             MultiselectSourceMock::class
         );
-
         $options = $sourceModel->getAllOptions();
         $product1Id = $options[0]['value'] * 10;
         $product2Id = $options[1]['value'] * 10;

From b638595533ab01757d407da1716098f12a4e51cf Mon Sep 17 00:00:00 2001
From: Jakub Winkler <jakub@qsolutionsstudio.com>
Date: Sun, 19 Sep 2021 12:10:32 +0200
Subject: [PATCH 14/87] #33486 - static file testing fix

---
 ...pdateMultiselectAttributesBackendTypes.php |   7 +-
 .../Catalog/Model/ProductGettersTest.php      |   3 -
 .../Product/Indexer/Eav/SourceTest.php        |   5 -
 .../products_with_multiselect_attribute.php   |   4 +-
 .../Magento/Test/Local/LiveCodeTest.php       | 506 ++++++++++++++++++
 .../PHPCompatibilityMagento/ruleset.xml       |  13 +
 .../Local/_files/blacklist/strict_type.txt    |   1 +
 .../Local/_files/phpcpd/blacklist/common.txt  | 111 ++++
 .../_files/phpcpd/blacklist/inventory.txt     |  11 +
 .../Test/Local/_files/phpmd/ruleset.xml       |  49 ++
 .../Local/_files/phpstan/blacklist/common.txt |  23 +
 .../Test/Local/_files/phpstan/phpstan.neon    |  49 ++
 .../Test/Local/_files/whitelist/common.txt    |   2 +
 13 files changed, 771 insertions(+), 13 deletions(-)
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Local/LiveCodeTest.php
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Local/_files/PHPCompatibilityMagento/ruleset.xml
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Local/_files/blacklist/strict_type.txt
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Local/_files/phpcpd/blacklist/common.txt
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Local/_files/phpcpd/blacklist/inventory.txt
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Local/_files/phpmd/ruleset.xml
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Local/_files/phpstan/blacklist/common.txt
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Local/_files/phpstan/phpstan.neon
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Local/_files/whitelist/common.txt

diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateMultiselectAttributesBackendTypes.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateMultiselectAttributesBackendTypes.php
index 06ffb40a7a1f2..fc83d7b9716a8 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateMultiselectAttributesBackendTypes.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateMultiselectAttributesBackendTypes.php
@@ -38,7 +38,7 @@ public function __construct(
     }
 
     /**
-     * @return array
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -46,7 +46,7 @@ public static function getDependencies()
     }
 
     /**
-     * @return array
+     * @inheritdoc
      */
     public function getAliases()
     {
@@ -54,8 +54,7 @@ public function getAliases()
     }
 
     /**
-     * @return UpdateMultiselectAttributesBackendTypes
-     * @throws LocalizedException
+     * @inheritdoc
      */
     public function apply()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php
index 9996ac4836831..76b90ff8fe732 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductGettersTest.php
@@ -207,7 +207,6 @@ public function testGetAttributeText()
         $this->assertEquals('Enabled', $this->_model->getAttributeText('status'));
     }
 
-
     /**
      * @magentoDataFixture Magento/Catalog/_files/products_with_multiselect_attribute.php
      */
@@ -226,7 +225,6 @@ public function testGetAttributeTextArray()
         );
     }
 
-
     /**
      * @magentoDataFixture Magento/Catalog/_files/products_with_multiselect_attribute.php
      */
@@ -246,7 +244,6 @@ public function testMultipleMultiselectTextValues()
         );
     }
 
-
     public function testGetCustomDesignDate()
     {
         $this->assertEquals(['from' => null, 'to' => null], $this->_model->getCustomDesignDate());
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
index 22579a28f3398..7e7b311625df2 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
@@ -14,11 +14,6 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Api\Data\StoreInterface;
 
-/**
- * Class SourceTest
- * @magentoAppIsolation enabled
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
 class SourceTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute.php
index 8ab595809d338..b6d96f4d114c1 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute.php
@@ -62,7 +62,9 @@
     ->setSku('simple_ms_2')
     ->setPrice(10)
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-    ->setMultiselectAttribute([$multiSelectAttributeOptionsIds[1], $multiSelectAttributeOptionsIds[2], $multiSelectAttributeOptionsIds[3]])
+    ->setMultiselectAttribute(
+        [$multiSelectAttributeOptionsIds[1], $multiSelectAttributeOptionsIds[2], $multiSelectAttributeOptionsIds[3]]
+    )
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
     ->save();
diff --git a/dev/tests/static/testsuite/Magento/Test/Local/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Local/LiveCodeTest.php
new file mode 100644
index 0000000000000..2df2b27c24fe3
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Local/LiveCodeTest.php
@@ -0,0 +1,506 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Test\Php;
+
+use Magento\Framework\App\Utility\Files;
+use Magento\TestFramework\CodingStandard\Tool\CodeMessDetector;
+use Magento\TestFramework\CodingStandard\Tool\CodeSniffer;
+use Magento\TestFramework\CodingStandard\Tool\CodeSniffer\Wrapper;
+use Magento\TestFramework\CodingStandard\Tool\CopyPasteDetector;
+use Magento\TestFramework\CodingStandard\Tool\PhpCompatibility;
+use Magento\TestFramework\CodingStandard\Tool\PhpStan;
+use Magento\TestFramework\Utility\AddedFiles;
+use Magento\TestFramework\Utility\FilesSearch;
+use PHPMD\TextUI\Command;
+
+/**
+ * Set of tests for static code analysis, e.g. code style, code complexity, copy paste detecting, etc.
+ */
+class LiveCodeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var string
+     */
+    protected static $reportDir = '';
+
+    /**
+     * @var string
+     */
+    protected static $pathToSource = '';
+
+    /**
+     * Setup basics for all tests
+     *
+     * @return void
+     */
+    public static function setUpBeforeClass(): void
+    {
+        self::$pathToSource = BP;
+        self::$reportDir = self::$pathToSource . '/dev/tests/static/report';
+        if (!is_dir(self::$reportDir)) {
+            mkdir(self::$reportDir);
+        }
+    }
+
+    /**
+     * Returns base folder for suite scope
+     *
+     * @return string
+     */
+    private static function getBaseFilesFolder()
+    {
+        return __DIR__;
+    }
+
+    /**
+     * Returns base directory for whitelisted files
+     *
+     * @return string
+     */
+    private static function getChangedFilesBaseDir()
+    {
+        return __DIR__ . '/..';
+    }
+
+    /**
+     * Returns whitelist based on blacklist and git changed files
+     *
+     * @param array $fileTypes
+     * @param string $changedFilesBaseDir
+     * @param string $baseFilesFolder
+     * @param string $whitelistFile
+     * @return array
+     */
+    public static function getWhitelist(
+        $fileTypes = ['php'],
+        $changedFilesBaseDir = '',
+        $baseFilesFolder = '',
+        $whitelistFile = '/_files/whitelist/common.txt'
+    ) {
+        $changedFiles = self::getChangedFilesList($changedFilesBaseDir);
+        if (empty($changedFiles)) {
+            return [];
+        }
+
+        $globPatternsFolder = ('' !== $baseFilesFolder) ? $baseFilesFolder : self::getBaseFilesFolder();
+        try {
+            $directoriesToCheck = Files::init()->readLists($globPatternsFolder . $whitelistFile);
+        } catch (\Exception $e) {
+            // no directories matched white list
+            return [];
+        }
+        $targetFiles = self::filterFiles($changedFiles, $fileTypes, $directoriesToCheck);
+        return $targetFiles;
+    }
+
+    /**
+     * This method loads list of changed files.
+     *
+     * List may be generated by:
+     *  - dev/tests/static/get_github_changes.php utility (allow to generate diffs between branches),
+     *  - CLI command "git diff --name-only > dev/tests/static/testsuite/Magento/Test/_files/changed_files_local.txt",
+     *
+     * If no generated changed files list found "git diff" will be used to find not committed changed
+     * (tests should be invoked from target gir repo).
+     *
+     * Note: "static" modifier used for compatibility with legacy implementation of self::getWhitelist method
+     *
+     * @param string $changedFilesBaseDir Base dir with previously generated list files
+     * @return string[] List of changed files
+     */
+    private static function getChangedFilesList($changedFilesBaseDir)
+    {
+        return FilesSearch::getFilesFromListFile(
+            $changedFilesBaseDir ?: self::getChangedFilesBaseDir(),
+            'changed_files*',
+            function () {
+                // if no list files, probably, this is the dev environment
+                // phpcs:disable Generic.PHP.NoSilencedErrors,Magento2.Security.InsecureFunction
+                @exec('git diff --name-only', $changedFiles);
+                @exec('git diff --cached --name-only', $addedFiles);
+                // phpcs:enable
+                $changedFiles = array_unique(array_merge($changedFiles, $addedFiles));
+                return $changedFiles;
+            }
+        );
+    }
+
+    /**
+     * Filter list of files.
+     *
+     * File removed from list:
+     *  - if it not exists,
+     *  - if allowed types are specified and file has another type (extension),
+     *  - if allowed directories specified and file not located in one of them.
+     *
+     * Note: "static" modifier used for compatibility with legacy implementation of self::getWhitelist method
+     *
+     * @param string[] $files List of file paths to filter
+     * @param string[] $allowedFileTypes List of allowed file extensions (pass empty array to allow all)
+     * @param string[] $allowedDirectories List of allowed directories (pass empty array to allow all)
+     * @return string[] Filtered file paths
+     */
+    private static function filterFiles(array $files, array $allowedFileTypes, array $allowedDirectories)
+    {
+        if (empty($allowedFileTypes)) {
+            $fileHasAllowedType = function () {
+                return true;
+            };
+        } else {
+            $fileHasAllowedType = function ($file) use ($allowedFileTypes) {
+                return in_array(pathinfo($file, PATHINFO_EXTENSION), $allowedFileTypes);
+            };
+        }
+
+        if (empty($allowedDirectories)) {
+            $fileIsInAllowedDirectory = function () {
+                return true;
+            };
+        } else {
+            $allowedDirectories = array_map('realpath', $allowedDirectories);
+            usort(
+                $allowedDirectories,
+                function ($dir1, $dir2) {
+                    return strlen($dir1) - strlen($dir2);
+                }
+            );
+            $fileIsInAllowedDirectory = function ($file) use ($allowedDirectories) {
+                foreach ($allowedDirectories as $directory) {
+                    if (strpos($file, $directory) === 0) {
+                        return true;
+                    }
+                }
+                return false;
+            };
+        }
+
+        $filtered = array_filter(
+            $files,
+            function ($file) use ($fileHasAllowedType, $fileIsInAllowedDirectory) {
+                $file = realpath($file);
+                if (false === $file) {
+                    return false;
+                }
+                return $fileHasAllowedType($file) && $fileIsInAllowedDirectory($file);
+            }
+        );
+
+        return $filtered;
+    }
+
+    /**
+     * Retrieves full list of codebase paths without any files/folders filtered out
+     *
+     * @return array
+     */
+    private function getFullWhitelist()
+    {
+        try {
+            return Files::init()->readLists(__DIR__ . '/_files/whitelist/common.txt');
+        } catch (\Exception $e) {
+            // nothing is whitelisted
+            return [];
+        }
+    }
+
+    /**
+     * Retrieves the lowest and highest PHP version specified in <kbd>composer.json</var> of project.
+     *
+     * @return array
+     */
+    private function getTargetPhpVersions(): array
+    {
+        $composerJson = json_decode(file_get_contents(BP . '/composer.json'), true);
+        $versionsRange = [];
+
+        if (isset($composerJson['require']['php'])) {
+            $versions = explode('||', $composerJson['require']['php']);
+
+            //normalize version constraints
+            foreach ($versions as $key => $version) {
+                $version = ltrim($version, '^~');
+                $version = str_replace('*', '999', $version);
+
+                $versions[$key] = $version;
+            }
+
+            //sort versions
+            usort($versions, 'version_compare');
+
+            $versionsRange[] = array_shift($versions);
+            if (!empty($versions)) {
+                $versionsRange[] = array_pop($versions);
+            }
+            foreach ($versionsRange as $key => $version) {
+                $versionParts  = explode('.', $versionsRange[$key]);
+                $versionsRange[$key] = sprintf('%s.%s', $versionParts[0], $versionParts[1] ?? '0');
+            }
+        }
+
+        return $versionsRange;
+    }
+
+    /**
+     * Returns whether a full scan was requested.
+     *
+     * This can be set in the `phpunit.xml` used to run these test cases, by setting the constant
+     * `TESTCODESTYLE_IS_FULL_SCAN` to `1`, e.g.:
+     * ```xml
+     * <php>
+     *     <!-- TESTCODESTYLE_IS_FULL_SCAN - specify if full scan should be performed for test code style test -->
+     *     <const name="TESTCODESTYLE_IS_FULL_SCAN" value="0"/>
+     * </php>
+     * ```
+     *
+     * @return bool
+     */
+    private function isFullScan(): bool
+    {
+        return defined('TESTCODESTYLE_IS_FULL_SCAN') && TESTCODESTYLE_IS_FULL_SCAN === '1';
+    }
+
+    /**
+     * Test code quality using phpcs
+     */
+    public function testCodeStyle()
+    {
+        $reportFile = self::$reportDir . '/phpcs_report.txt';
+        if (!file_exists($reportFile)) {
+            touch($reportFile);
+        }
+        $codeSniffer = new CodeSniffer('Magento', $reportFile, new Wrapper());
+        $fileList = $this->isFullScan() ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml']);
+        $ignoreList = Files::init()->readLists(__DIR__ . '/_files/phpcs/ignorelist/*.txt');
+        if ($ignoreList) {
+            $ignoreListPattern = sprintf('#(%s)#i', implode('|', $ignoreList));
+            $fileList = array_filter(
+                $fileList,
+                function ($path) use ($ignoreListPattern) {
+                    return !preg_match($ignoreListPattern, $path);
+                }
+            );
+        }
+
+        $result = $codeSniffer->run($fileList);
+        $report = file_get_contents($reportFile);
+        $this->assertEquals(
+            0,
+            $result,
+            "PHP Code Sniffer detected {$result} violation(s): " . PHP_EOL . $report
+        );
+    }
+
+    /**
+     * Test code quality using phpmd
+     */
+    public function testCodeMess()
+    {
+        $reportFile = self::$reportDir . '/phpmd_report.txt';
+        $codeMessDetector = new CodeMessDetector(realpath(__DIR__ . '/_files/phpmd/ruleset.xml'), $reportFile);
+
+        if (!$codeMessDetector->canRun()) {
+            $this->markTestSkipped('PHP Mess Detector is not available.');
+        }
+        $fileList = self::getWhitelist(['php']);
+        $ignoreList = Files::init()->readLists(__DIR__ . '/_files/phpmd/ignorelist/*.txt');
+        if ($ignoreList) {
+            $ignoreListPattern = sprintf('#(%s)#i', implode('|', $ignoreList));
+            $fileList = array_filter(
+                $fileList,
+                function ($path) use ($ignoreListPattern) {
+                    return !preg_match($ignoreListPattern, $path);
+                }
+            );
+        }
+
+        $result = $codeMessDetector->run($fileList);
+
+        $output = "";
+        if (file_exists($reportFile)) {
+            $output = file_get_contents($reportFile);
+        }
+
+        $this->assertEquals(
+            Command::EXIT_SUCCESS,
+            $result,
+            "PHP Code Mess has found error(s):" . PHP_EOL . $output
+        );
+
+        // delete empty reports
+        if (file_exists($reportFile)) {
+            unlink($reportFile);
+        }
+    }
+
+    /**
+     * Test code quality using phpcpd
+     */
+    public function testCopyPaste()
+    {
+        $reportFile = self::$reportDir . '/phpcpd_report.xml';
+        $copyPasteDetector = new CopyPasteDetector($reportFile);
+
+        if (!$copyPasteDetector->canRun()) {
+            $this->markTestSkipped('PHP Copy/Paste Detector is not available.');
+        }
+
+        $blackList = [];
+        foreach (glob(__DIR__ . '/_files/phpcpd/blacklist/*.txt') as $list) {
+            $blackList[] = file($list, FILE_IGNORE_NEW_LINES);
+        }
+        $blackList = array_merge([], ...$blackList);
+
+        $copyPasteDetector->setBlackList($blackList);
+
+        $result = $copyPasteDetector->run([BP]);
+
+        $output = file_exists($reportFile) ? file_get_contents($reportFile) : '';
+
+        $this->assertTrue(
+            $result,
+            "PHP Copy/Paste Detector has found error(s):" . PHP_EOL . $output
+        );
+    }
+
+    /**
+     * Tests whitelisted files for strict type declarations.
+     */
+    public function testStrictTypes()
+    {
+        $changedFiles = AddedFiles::getAddedFilesList(self::getChangedFilesBaseDir());
+
+        try {
+            $blackList = Files::init()->readLists(
+                self::getBaseFilesFolder() . '/_files/blacklist/strict_type.txt'
+            );
+        } catch (\Exception $e) {
+            // nothing matched black list
+            $blackList = [];
+        }
+
+        $toBeTestedFiles = array_diff(
+            self::filterFiles($changedFiles, ['php'], []),
+            $blackList
+        );
+
+        $filesMissingStrictTyping = [];
+        foreach ($toBeTestedFiles as $fileName) {
+            $file = file_get_contents($fileName);
+            if (strstr($file, 'strict_types=1') === false) {
+                $filesMissingStrictTyping[] = $fileName;
+            }
+        }
+
+        $this->assertCount(
+            0,
+            $filesMissingStrictTyping,
+            "Following files are missing strict type declaration:"
+            . PHP_EOL
+            . implode(PHP_EOL, $filesMissingStrictTyping)
+        );
+    }
+
+    /**
+     * Test for compatibility to lowest PHP version declared in <kbd>composer.json</kbd>.
+     */
+    public function testPhpCompatibility()
+    {
+        $targetVersions = $this->getTargetPhpVersions();
+        $this->assertNotEmpty($targetVersions, 'No supported versions information in composer.json');
+        $reportFile    = self::$reportDir . '/phpcompatibility_report.txt';
+        $rulesetDir    = __DIR__ . '/_files/PHPCompatibilityMagento';
+
+        if (!file_exists($reportFile)) {
+            touch($reportFile);
+        }
+
+        $codeSniffer = new PhpCompatibility($rulesetDir, $reportFile, new Wrapper());
+        if (count($targetVersions) > 1) {
+            $codeSniffer->setTestVersion($targetVersions[0] . '-' . $targetVersions[1]);
+        } else {
+            $codeSniffer->setTestVersion($targetVersions[0]);
+        }
+
+        $result = $codeSniffer->run(
+            $this->isFullScan() ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml'])
+        );
+        $report = file_get_contents($reportFile);
+
+        $this->assertEquals(
+            0,
+            $result,
+            'PHP Compatibility detected violation(s):' . PHP_EOL . $report
+        );
+    }
+
+    /**
+     * Test code quality using PHPStan
+     *
+     * @throws \Exception
+     */
+    public function testPhpStan()
+    {
+        $reportFile = self::$reportDir . '/phpstan_report.txt';
+        $confFile = __DIR__ . '/_files/phpstan/phpstan.neon';
+
+        if (!file_exists($reportFile)) {
+            touch($reportFile);
+        }
+
+        $fileList = self::getWhitelist(['php']);
+        $blackList = Files::init()->readLists(__DIR__ . '/_files/phpstan/blacklist/*.txt');
+        if ($blackList) {
+            $blackListPattern = sprintf('#(%s)#i', implode('|', $blackList));
+            $fileList = array_filter(
+                $fileList,
+                function ($path) use ($blackListPattern) {
+                    return !preg_match($blackListPattern, $path);
+                }
+            );
+        }
+
+        $phpStan = new PhpStan($confFile, $reportFile);
+        $exitCode = $phpStan->run($fileList);
+        $report = file_get_contents($reportFile);
+
+        $errorMessage = empty($report) ?
+            'PHPStan command run failed.' : 'PHPStan detected violation(s):' . PHP_EOL . $report;
+        $this->assertEquals(0, $exitCode, $errorMessage);
+    }
+
+    /**
+     * Tests whitelisted fixtures for reuse other fixtures.
+     */
+    public function testFixtureReuse()
+    {
+        $changedFiles =  self::getWhitelist(['php']);
+        $toBeTestedFiles = self::filterFiles($changedFiles, ['php'], []);
+
+        $filesWithIncorrectReuse = [];
+        foreach ($toBeTestedFiles as $fileName) {
+            //check only _files and Fixtures directory
+            if (!preg_match('/integration.+\/(_files|Fixtures)/', $fileName)) {
+                continue;
+            }
+            $file = str_replace(["\n", "\r"], '', file_get_contents($fileName));
+            if (preg_match('/(?<![\=\s*])\b(require|require_once|include)\b/', $file)) {
+                $filesWithIncorrectReuse[] = $fileName;
+            }
+        }
+
+        $this->assertEquals(
+            0,
+            count($filesWithIncorrectReuse),
+            "The following files incorrectly reuse fixtures:"
+            . PHP_EOL
+            . implode(PHP_EOL, $filesWithIncorrectReuse)
+            . PHP_EOL
+            . 'Please use Magento\TestFramework\Workaround\Override\Fixture\Resolver::requireDataFixture'
+        );
+    }
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Local/_files/PHPCompatibilityMagento/ruleset.xml b/dev/tests/static/testsuite/Magento/Test/Local/_files/PHPCompatibilityMagento/ruleset.xml
new file mode 100644
index 0000000000000..579a6d2416f20
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Local/_files/PHPCompatibilityMagento/ruleset.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<ruleset name="PHPCompatibilityMagento">
+    <description>Magento 2 specific ruleset which checks for PHP cross version compatibility.</description>
+    <rule ref="PHPCompatibility">
+        <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
+    </rule>
+</ruleset>
diff --git a/dev/tests/static/testsuite/Magento/Test/Local/_files/blacklist/strict_type.txt b/dev/tests/static/testsuite/Magento/Test/Local/_files/blacklist/strict_type.txt
new file mode 100644
index 0000000000000..877583e5b6a29
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Local/_files/blacklist/strict_type.txt
@@ -0,0 +1 @@
+# Format: <componentType=module|library|theme|language|*> <componentName> <globPattern> or simply <globPattern>
diff --git a/dev/tests/static/testsuite/Magento/Test/Local/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Local/_files/phpcpd/blacklist/common.txt
new file mode 100644
index 0000000000000..efc7e669b3605
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Local/_files/phpcpd/blacklist/common.txt
@@ -0,0 +1,111 @@
+app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
+app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
+app/code/Magento/Backend/Test/Unit/Model/_files/
+app/code/Magento/Bundle
+app/code/Magento/Catalog/Model/Product/Visibility.php
+app/code/Magento/Catalog/Model/Product/Attribute/Source/Status.php
+app/code/Magento/Catalog/Model/Category.php
+app/code/Magento/Catalog/Model/ResourceModel/Product/Link/SaveHandler.php
+dev
+lib/internal/Magento/Framework/DB/Select/RendererProxy.php
+lib/internal/Magento/Framework/DB/Query/Generator.php
+app/code/Magento/Paypal/Model/Method/Agreement.php
+app/code/Magento/Paypal/Test/Unit/Model/_files/additional_info_data.php
+app/code/Magento/Downloadable/Model/Link.php
+app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php
+app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php
+app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
+app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
+app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
+app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
+app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
+app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php
+app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Auto.php
+app/code/Magento/Sales/Model/Order/Pdf/
+app/code/Magento/Sales/Model/Order/CreditmemoRepository.php
+app/code/Magento/Sales/Model/Order/Email/Container/
+app/code/Magento/Sales/Model/Order/Invoice.php
+app/code/Magento/Sales/Model/Order/Invoice/Item.php
+app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
+app/code/Magento/Sales/Model/Order/ShipmentRepository.php
+app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Relation/Refund.php
+app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
+app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
+app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
+app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php
+app/code/Magento/Shipping/Block/Order/Shipment.php
+app/code/Magento/Sales/Block/Order/Creditmemo.php
+app/code/Magento/Sales/Block/Order/Invoice.php
+app/code/Magento/Sales/Block/Order/PrintOrder/Creditmemo.php
+app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php
+app/code/Magento/AdvancedCheckout/Controller/Adminhtml/Index/ConfigureQuoteItems.php
+app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
+app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php
+app/code/Magento/Customer/Controller/Adminhtml/Address/Viewfile.php
+app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
+app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
+app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
+app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
+app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php
+app/code/Magento/ProductAlert/Model/Observer.php
+app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php
+app/code/Magento/Reports/Model/ResourceModel/Customer/Totals/Collection.php
+app/code/Magento/Review/Block/Customer/View.php
+app/code/Magento/Rule/Test/Mftf/Helper/RuleHelper.php
+app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus/Form.php
+app/code/Magento/Sales/Model/ResourceModel/Collection/AbstractCollection.php
+app/code/Magento/Sales/Model/ResourceModel/Report/
+app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
+app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
+app/code/Magento/CatalogRule/Model/ResourceModel/SaveHandler.php
+lib/internal/Magento/Framework/HTTP/Client/Socket.php
+lib/internal/Magento/Framework/App/Config/Scope/Validator.php
+app/code/Magento/Cron/Model/Schedule.php
+generated/code
+lib/internal/Magento/Framework/Filesystem/Driver/File/Mime.php
+app/code/Magento/Shipping/Model/Rate/PackageResult.php
+app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
+app/code/Magento/Ui/Config/Converter/Url.php
+app/code/Magento/Ui/Config/Converter/Buttons.php
+app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
+app/code/Magento/Sales/Api/Data/CreditmemoItemInterface.php
+vendor
+lib/internal/Magento/Framework/DataObject/Copy/Config/Data/Proxy.php
+app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWebsiteAttributes.php
+app/code/Magento/CatalogUrlRewrite/Setup/Recurring.php
+app/code/Magento/Checkout/Setup/Patch/Data/PrepareInitialCheckoutConfiguration.php
+app/code/Magento/ConfigurableProduct/Setup/Recurring.php
+app/code/Magento/Sales/Setup/SalesSetup.php
+app/code/Magento/Weee/Setup/Recurring.php
+app/code/Magento/Wishlist/Setup/Recurring.php
+setup/src/Magento/Setup/Fixtures
+app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Rows.php
+app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
+app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
+app/code/Magento/Catalog/Ui/Component/Listing/
+app/code/Magento/Payment/Gateway/Data/Order/AddressAdapter.php
+app/code/Magento/SalesRule/Model/CouponRepository.php
+app/code/Magento/SalesRule/Test/Unit/Model/Rule/Metadata/_files/MetaData.php
+app/code/Magento/Tax/Model/Calculation/UnitBaseCalculator.php
+app/code/Magento/Customer/Block/Widget/
+app/code/Magento/Persistent/Observer/EmulateCustomerObserver.php
+app/code/Magento/Eav/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php
+lib/internal/Magento/Framework/App/AreaList/Proxy.php
+lib/internal/Magento/Framework/App/Route/ConfigInterface/Proxy.php
+lib/internal/Magento/Framework/Backup/Filesystem/Iterator/Filter.php
+app/code/Magento/Theme/Model/Indexer/Design/Config.php
+lib/internal/Magento/Framework/Mview/Config/Data/Proxy.php
+lib/internal/Magento/Framework/View/File/Collector/Override
+lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/
+lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItem/Iterator.php
+lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Iterator.php
+app/code/Magento/Integration/Model/IntegrationConfig.php
+*Test.php
+Test/_files
+Test/Unit/_files
+Test/Integration/_files
+app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
+app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php
+app/code/Magento/Elasticsearch/Model/Layer/Search/ItemCollectionProvider.php
+app/code/Magento/Newsletter/Model/Queue/TransportBuilder.php
+app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
diff --git a/dev/tests/static/testsuite/Magento/Test/Local/_files/phpcpd/blacklist/inventory.txt b/dev/tests/static/testsuite/Magento/Test/Local/_files/phpcpd/blacklist/inventory.txt
new file mode 100644
index 0000000000000..0a12e975e097e
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Local/_files/phpcpd/blacklist/inventory.txt
@@ -0,0 +1,11 @@
+app/code/Magento/InventoryBundleProductIndexer/Indexer/SelectBuilder.php
+app/code/Magento/InventoryConfigurableProductIndexer/Indexer/SelectBuilder.php
+app/code/Magento/InventoryCatalogAdminUi/Controller/Adminhtml/Source/BulkAssignPost.php
+app/code/Magento/InventoryBundleProductIndexer/Indexer/SourceItem/SourceItemIndexer.php
+app/code/Magento/InventoryShippingAdminUi/Ui/DataProvider/GetSourcesByOrderIdSkuAndQty.php
+app/code/Magento/InventoryBundleProductIndexer/Indexer/SourceItem/SiblingSkuListInStockProvider.php
+app/code/Magento/InventoryInStorePickupWebapiExtension/Model/Rest/Swagger/Generator.php
+app/code/Magento/InventoryAdminUi/Controller/Adminhtml/Source/MassDisable.php
+app/code/Magento/InventoryBundleProductIndexer/Indexer/StockIndexer.php
+app/code/Magento/InventoryBundleProductIndexer/Indexer/SelectBuilder.php
+app/code/Magento/InventoryConfigurableProductIndexer/Indexer/SourceItem/SiblingSkuListInStockProvider.php
diff --git a/dev/tests/static/testsuite/Magento/Test/Local/_files/phpmd/ruleset.xml b/dev/tests/static/testsuite/Magento/Test/Local/_files/phpmd/ruleset.xml
new file mode 100644
index 0000000000000..0e3b5fa3d341c
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Local/_files/phpmd/ruleset.xml
@@ -0,0 +1,49 @@
+<?xml version='1.0' encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<ruleset name="Magento PHPMD rule set" xmlns="http://pmd.sf.net/ruleset/1.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+         xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+    <description>Magento Code Check Rules</description>
+    <php-includepath>../../../../../../framework</php-includepath>
+
+    <!-- Code Size Rules -->
+    <rule ref="rulesets/codesize.xml/CyclomaticComplexity" />
+    <rule ref="rulesets/codesize.xml/NPathComplexity" />
+    <rule ref="rulesets/codesize.xml/ExcessiveMethodLength" />
+    <rule ref="rulesets/codesize.xml/ExcessiveParameterList" />
+    <rule ref="rulesets/codesize.xml/ExcessivePublicCount" />
+    <rule ref="rulesets/codesize.xml/TooManyFields" />
+    <rule ref="rulesets/codesize.xml/ExcessiveClassComplexity">
+        <properties>
+            <property name="maximum" value="100" />
+        </properties>
+    </rule>
+
+    <!-- Unused code rules -->
+    <rule ref="rulesets/unusedcode.xml" />
+
+    <!-- Code design rules -->
+    <rule ref="rulesets/design.xml/NumberOfChildren" />
+    <rule ref="rulesets/design.xml/DepthOfInheritance">
+        <properties>
+            <property name="minimum" value="8" />
+        </properties>
+    </rule>
+    <rule ref="rulesets/design.xml/CouplingBetweenObjects" />
+
+    <!-- Naming Rules -->
+    <rule ref="rulesets/naming.xml/ShortMethodName" />
+    <rule ref="rulesets/naming.xml/ConstantNamingConventions" />
+    <rule ref="rulesets/naming.xml/BooleanGetMethodName" />
+
+    <!-- Magento Specific Rules -->
+    <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/AllPurposeAction" />
+    <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/CookieAndSessionMisuse" />
+
+</ruleset>
diff --git a/dev/tests/static/testsuite/Magento/Test/Local/_files/phpstan/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Local/_files/phpstan/blacklist/common.txt
new file mode 100644
index 0000000000000..6b0007f58830b
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Local/_files/phpstan/blacklist/common.txt
@@ -0,0 +1,23 @@
+# Format: path to directory or path to file
+#
+# Example:
+# app/code/Magento/Catalog
+# dev/tests/static/framework/bootstrap.php
+lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
+lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
+lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/InterceptorTest.php
+lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php
+dev/tests/integration/framework/deployTestModules.php
+dev/tests/integration/testsuite/Magento/Framework/Code/Generator/AutoloaderTest.php
+dev/tests/integration/testsuite/Magento/Framework/Communication/ConfigTest.php
+dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/SimpleDirectiveTest.php
+dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php
+dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
+dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/AbstractFiltersTest.php
+dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/CategoryTest.php
+dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.php
+dev/tests/api-functional/testsuite/Magento/Framework/Model/Entity/HydratorTest.php
+dev/tests/api-functional/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php
+dev/tests/api-functional/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php
+app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php
+app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolverTest.php
diff --git a/dev/tests/static/testsuite/Magento/Test/Local/_files/phpstan/phpstan.neon b/dev/tests/static/testsuite/Magento/Test/Local/_files/phpstan/phpstan.neon
new file mode 100644
index 0000000000000..aba7d0b46d297
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Local/_files/phpstan/phpstan.neon
@@ -0,0 +1,49 @@
+parameters:
+    checkExplicitMixedMissingReturn: true
+    checkPhpDocMissingReturn: true
+    reportUnmatchedIgnoredErrors: false
+    excludes_analyse:
+        - %rootDir%/../../../lib/internal/Magento/Framework/ObjectManager/Test/Unit/*
+        - %rootDir%/../../../*/_files/*
+        - %rootDir%/../../../dev/tests/*/Fixtures/*
+        - %rootDir%/../../../dev/tests/*/tmp/*
+        - %rootDir%/../../../dev/tests/*/_generated/*
+        - %rootDir%/../../../pub/*
+    scanDirectories:
+        - %rootDir%/../../../dev/tests/static/framework/tests/unit/testsuite/Magento
+        - %rootDir%/../../../dev/tests/integration/framework/tests/unit/testsuite/Magento
+        - %rootDir%/../../../dev/tests/api-functional/_files/Magento
+    bootstrapFiles:
+            - %rootDir%/../../../dev/tests/static/framework/autoload.php
+            - %rootDir%/../../../dev/tests/integration/framework/autoload.php
+            - %rootDir%/../../../dev/tests/api-functional/framework/autoload.php
+            - %rootDir%/../../../dev/tests/setup-integration/framework/autoload.php
+            - %rootDir%/../../../dev/tests/static/framework/Magento/PhpStan/autoload.php
+    ignoreErrors:
+        # Ignore PHPStan\Rules\Classes\UnusedConstructorParametersRule
+        - '#Constructor of class [a-zA-Z0-9\\_]+ has an unused parameter#'
+        # Ignore setCustomErrorHandler function not found in bootstrap files
+        - '#Function setCustomErrorHandler not found#'
+        # Ignore 'return statement is missing' error when 'void' is present in return type list
+        - '#Method (?:.*?) should return (?:.*?)void(?:.*?) but return statement is missing.#'
+        # Ignore constants, defined dynamically.
+        - '#Constant TESTS_WEB_API_ADAPTER not found.#'
+        - '#Constant TESTS_BASE_URL not found.#'
+        - '#Constant TESTS_XDEBUG_ENABLED not found.#'
+        - '#Constant TESTS_XDEBUG_SESSION not found.#'
+        - '#Constant INTEGRATION_TESTS_DIR not found.#'
+        - '#Constant MAGENTO_MODULES_PATH not found.#'
+        - '#Constant TESTS_MODULES_PATH not found.#'
+        - '#Constant TESTS_INSTALLATION_DB_CONFIG_FILE not found.#'
+        - '#Constant T_[A-Z_]+ not found.#'
+
+
+services:
+    -
+        class: Magento\PhpStan\Reflection\Php\DataObjectClassReflectionExtension
+        tags: {phpstan.broker.methodsClassReflectionExtension: {priority: 100}}
+
+    errorFormatter.filtered:
+        class: Magento\PhpStan\Formatters\FilteredErrorFormatter
+        arguments:
+            tableErrorFormatter: @errorFormatter.table
diff --git a/dev/tests/static/testsuite/Magento/Test/Local/_files/whitelist/common.txt b/dev/tests/static/testsuite/Magento/Test/Local/_files/whitelist/common.txt
new file mode 100644
index 0000000000000..ffb7d924f9d5a
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Local/_files/whitelist/common.txt
@@ -0,0 +1,2 @@
+# Format: <componentType=module|library|theme|language|*> <componentName> <globPattern> or simply <globPattern>
+app/code/Magento/Catalog/Setup/Patch/Data/UpdateMultiselectAttributesBackendTypes.php

From 36c2c8a5a7bc2fc029dc82bcc0fc771a0b7c0dd9 Mon Sep 17 00:00:00 2001
From: Jakub Winkler <jakub@qsolutionsstudio.com>
Date: Sun, 19 Sep 2021 12:11:40 +0200
Subject: [PATCH 15/87] #33486 - static file testing fix - removing local tests

---
 .../Magento/Test/Local/LiveCodeTest.php       | 506 ------------------
 .../PHPCompatibilityMagento/ruleset.xml       |  13 -
 .../Local/_files/blacklist/strict_type.txt    |   1 -
 .../Local/_files/phpcpd/blacklist/common.txt  | 111 ----
 .../_files/phpcpd/blacklist/inventory.txt     |  11 -
 .../Test/Local/_files/phpmd/ruleset.xml       |  49 --
 .../Local/_files/phpstan/blacklist/common.txt |  23 -
 .../Test/Local/_files/phpstan/phpstan.neon    |  49 --
 .../Test/Local/_files/whitelist/common.txt    |   2 -
 9 files changed, 765 deletions(-)
 delete mode 100644 dev/tests/static/testsuite/Magento/Test/Local/LiveCodeTest.php
 delete mode 100644 dev/tests/static/testsuite/Magento/Test/Local/_files/PHPCompatibilityMagento/ruleset.xml
 delete mode 100644 dev/tests/static/testsuite/Magento/Test/Local/_files/blacklist/strict_type.txt
 delete mode 100644 dev/tests/static/testsuite/Magento/Test/Local/_files/phpcpd/blacklist/common.txt
 delete mode 100644 dev/tests/static/testsuite/Magento/Test/Local/_files/phpcpd/blacklist/inventory.txt
 delete mode 100644 dev/tests/static/testsuite/Magento/Test/Local/_files/phpmd/ruleset.xml
 delete mode 100644 dev/tests/static/testsuite/Magento/Test/Local/_files/phpstan/blacklist/common.txt
 delete mode 100644 dev/tests/static/testsuite/Magento/Test/Local/_files/phpstan/phpstan.neon
 delete mode 100644 dev/tests/static/testsuite/Magento/Test/Local/_files/whitelist/common.txt

diff --git a/dev/tests/static/testsuite/Magento/Test/Local/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Local/LiveCodeTest.php
deleted file mode 100644
index 2df2b27c24fe3..0000000000000
--- a/dev/tests/static/testsuite/Magento/Test/Local/LiveCodeTest.php
+++ /dev/null
@@ -1,506 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Test\Php;
-
-use Magento\Framework\App\Utility\Files;
-use Magento\TestFramework\CodingStandard\Tool\CodeMessDetector;
-use Magento\TestFramework\CodingStandard\Tool\CodeSniffer;
-use Magento\TestFramework\CodingStandard\Tool\CodeSniffer\Wrapper;
-use Magento\TestFramework\CodingStandard\Tool\CopyPasteDetector;
-use Magento\TestFramework\CodingStandard\Tool\PhpCompatibility;
-use Magento\TestFramework\CodingStandard\Tool\PhpStan;
-use Magento\TestFramework\Utility\AddedFiles;
-use Magento\TestFramework\Utility\FilesSearch;
-use PHPMD\TextUI\Command;
-
-/**
- * Set of tests for static code analysis, e.g. code style, code complexity, copy paste detecting, etc.
- */
-class LiveCodeTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var string
-     */
-    protected static $reportDir = '';
-
-    /**
-     * @var string
-     */
-    protected static $pathToSource = '';
-
-    /**
-     * Setup basics for all tests
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass(): void
-    {
-        self::$pathToSource = BP;
-        self::$reportDir = self::$pathToSource . '/dev/tests/static/report';
-        if (!is_dir(self::$reportDir)) {
-            mkdir(self::$reportDir);
-        }
-    }
-
-    /**
-     * Returns base folder for suite scope
-     *
-     * @return string
-     */
-    private static function getBaseFilesFolder()
-    {
-        return __DIR__;
-    }
-
-    /**
-     * Returns base directory for whitelisted files
-     *
-     * @return string
-     */
-    private static function getChangedFilesBaseDir()
-    {
-        return __DIR__ . '/..';
-    }
-
-    /**
-     * Returns whitelist based on blacklist and git changed files
-     *
-     * @param array $fileTypes
-     * @param string $changedFilesBaseDir
-     * @param string $baseFilesFolder
-     * @param string $whitelistFile
-     * @return array
-     */
-    public static function getWhitelist(
-        $fileTypes = ['php'],
-        $changedFilesBaseDir = '',
-        $baseFilesFolder = '',
-        $whitelistFile = '/_files/whitelist/common.txt'
-    ) {
-        $changedFiles = self::getChangedFilesList($changedFilesBaseDir);
-        if (empty($changedFiles)) {
-            return [];
-        }
-
-        $globPatternsFolder = ('' !== $baseFilesFolder) ? $baseFilesFolder : self::getBaseFilesFolder();
-        try {
-            $directoriesToCheck = Files::init()->readLists($globPatternsFolder . $whitelistFile);
-        } catch (\Exception $e) {
-            // no directories matched white list
-            return [];
-        }
-        $targetFiles = self::filterFiles($changedFiles, $fileTypes, $directoriesToCheck);
-        return $targetFiles;
-    }
-
-    /**
-     * This method loads list of changed files.
-     *
-     * List may be generated by:
-     *  - dev/tests/static/get_github_changes.php utility (allow to generate diffs between branches),
-     *  - CLI command "git diff --name-only > dev/tests/static/testsuite/Magento/Test/_files/changed_files_local.txt",
-     *
-     * If no generated changed files list found "git diff" will be used to find not committed changed
-     * (tests should be invoked from target gir repo).
-     *
-     * Note: "static" modifier used for compatibility with legacy implementation of self::getWhitelist method
-     *
-     * @param string $changedFilesBaseDir Base dir with previously generated list files
-     * @return string[] List of changed files
-     */
-    private static function getChangedFilesList($changedFilesBaseDir)
-    {
-        return FilesSearch::getFilesFromListFile(
-            $changedFilesBaseDir ?: self::getChangedFilesBaseDir(),
-            'changed_files*',
-            function () {
-                // if no list files, probably, this is the dev environment
-                // phpcs:disable Generic.PHP.NoSilencedErrors,Magento2.Security.InsecureFunction
-                @exec('git diff --name-only', $changedFiles);
-                @exec('git diff --cached --name-only', $addedFiles);
-                // phpcs:enable
-                $changedFiles = array_unique(array_merge($changedFiles, $addedFiles));
-                return $changedFiles;
-            }
-        );
-    }
-
-    /**
-     * Filter list of files.
-     *
-     * File removed from list:
-     *  - if it not exists,
-     *  - if allowed types are specified and file has another type (extension),
-     *  - if allowed directories specified and file not located in one of them.
-     *
-     * Note: "static" modifier used for compatibility with legacy implementation of self::getWhitelist method
-     *
-     * @param string[] $files List of file paths to filter
-     * @param string[] $allowedFileTypes List of allowed file extensions (pass empty array to allow all)
-     * @param string[] $allowedDirectories List of allowed directories (pass empty array to allow all)
-     * @return string[] Filtered file paths
-     */
-    private static function filterFiles(array $files, array $allowedFileTypes, array $allowedDirectories)
-    {
-        if (empty($allowedFileTypes)) {
-            $fileHasAllowedType = function () {
-                return true;
-            };
-        } else {
-            $fileHasAllowedType = function ($file) use ($allowedFileTypes) {
-                return in_array(pathinfo($file, PATHINFO_EXTENSION), $allowedFileTypes);
-            };
-        }
-
-        if (empty($allowedDirectories)) {
-            $fileIsInAllowedDirectory = function () {
-                return true;
-            };
-        } else {
-            $allowedDirectories = array_map('realpath', $allowedDirectories);
-            usort(
-                $allowedDirectories,
-                function ($dir1, $dir2) {
-                    return strlen($dir1) - strlen($dir2);
-                }
-            );
-            $fileIsInAllowedDirectory = function ($file) use ($allowedDirectories) {
-                foreach ($allowedDirectories as $directory) {
-                    if (strpos($file, $directory) === 0) {
-                        return true;
-                    }
-                }
-                return false;
-            };
-        }
-
-        $filtered = array_filter(
-            $files,
-            function ($file) use ($fileHasAllowedType, $fileIsInAllowedDirectory) {
-                $file = realpath($file);
-                if (false === $file) {
-                    return false;
-                }
-                return $fileHasAllowedType($file) && $fileIsInAllowedDirectory($file);
-            }
-        );
-
-        return $filtered;
-    }
-
-    /**
-     * Retrieves full list of codebase paths without any files/folders filtered out
-     *
-     * @return array
-     */
-    private function getFullWhitelist()
-    {
-        try {
-            return Files::init()->readLists(__DIR__ . '/_files/whitelist/common.txt');
-        } catch (\Exception $e) {
-            // nothing is whitelisted
-            return [];
-        }
-    }
-
-    /**
-     * Retrieves the lowest and highest PHP version specified in <kbd>composer.json</var> of project.
-     *
-     * @return array
-     */
-    private function getTargetPhpVersions(): array
-    {
-        $composerJson = json_decode(file_get_contents(BP . '/composer.json'), true);
-        $versionsRange = [];
-
-        if (isset($composerJson['require']['php'])) {
-            $versions = explode('||', $composerJson['require']['php']);
-
-            //normalize version constraints
-            foreach ($versions as $key => $version) {
-                $version = ltrim($version, '^~');
-                $version = str_replace('*', '999', $version);
-
-                $versions[$key] = $version;
-            }
-
-            //sort versions
-            usort($versions, 'version_compare');
-
-            $versionsRange[] = array_shift($versions);
-            if (!empty($versions)) {
-                $versionsRange[] = array_pop($versions);
-            }
-            foreach ($versionsRange as $key => $version) {
-                $versionParts  = explode('.', $versionsRange[$key]);
-                $versionsRange[$key] = sprintf('%s.%s', $versionParts[0], $versionParts[1] ?? '0');
-            }
-        }
-
-        return $versionsRange;
-    }
-
-    /**
-     * Returns whether a full scan was requested.
-     *
-     * This can be set in the `phpunit.xml` used to run these test cases, by setting the constant
-     * `TESTCODESTYLE_IS_FULL_SCAN` to `1`, e.g.:
-     * ```xml
-     * <php>
-     *     <!-- TESTCODESTYLE_IS_FULL_SCAN - specify if full scan should be performed for test code style test -->
-     *     <const name="TESTCODESTYLE_IS_FULL_SCAN" value="0"/>
-     * </php>
-     * ```
-     *
-     * @return bool
-     */
-    private function isFullScan(): bool
-    {
-        return defined('TESTCODESTYLE_IS_FULL_SCAN') && TESTCODESTYLE_IS_FULL_SCAN === '1';
-    }
-
-    /**
-     * Test code quality using phpcs
-     */
-    public function testCodeStyle()
-    {
-        $reportFile = self::$reportDir . '/phpcs_report.txt';
-        if (!file_exists($reportFile)) {
-            touch($reportFile);
-        }
-        $codeSniffer = new CodeSniffer('Magento', $reportFile, new Wrapper());
-        $fileList = $this->isFullScan() ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml']);
-        $ignoreList = Files::init()->readLists(__DIR__ . '/_files/phpcs/ignorelist/*.txt');
-        if ($ignoreList) {
-            $ignoreListPattern = sprintf('#(%s)#i', implode('|', $ignoreList));
-            $fileList = array_filter(
-                $fileList,
-                function ($path) use ($ignoreListPattern) {
-                    return !preg_match($ignoreListPattern, $path);
-                }
-            );
-        }
-
-        $result = $codeSniffer->run($fileList);
-        $report = file_get_contents($reportFile);
-        $this->assertEquals(
-            0,
-            $result,
-            "PHP Code Sniffer detected {$result} violation(s): " . PHP_EOL . $report
-        );
-    }
-
-    /**
-     * Test code quality using phpmd
-     */
-    public function testCodeMess()
-    {
-        $reportFile = self::$reportDir . '/phpmd_report.txt';
-        $codeMessDetector = new CodeMessDetector(realpath(__DIR__ . '/_files/phpmd/ruleset.xml'), $reportFile);
-
-        if (!$codeMessDetector->canRun()) {
-            $this->markTestSkipped('PHP Mess Detector is not available.');
-        }
-        $fileList = self::getWhitelist(['php']);
-        $ignoreList = Files::init()->readLists(__DIR__ . '/_files/phpmd/ignorelist/*.txt');
-        if ($ignoreList) {
-            $ignoreListPattern = sprintf('#(%s)#i', implode('|', $ignoreList));
-            $fileList = array_filter(
-                $fileList,
-                function ($path) use ($ignoreListPattern) {
-                    return !preg_match($ignoreListPattern, $path);
-                }
-            );
-        }
-
-        $result = $codeMessDetector->run($fileList);
-
-        $output = "";
-        if (file_exists($reportFile)) {
-            $output = file_get_contents($reportFile);
-        }
-
-        $this->assertEquals(
-            Command::EXIT_SUCCESS,
-            $result,
-            "PHP Code Mess has found error(s):" . PHP_EOL . $output
-        );
-
-        // delete empty reports
-        if (file_exists($reportFile)) {
-            unlink($reportFile);
-        }
-    }
-
-    /**
-     * Test code quality using phpcpd
-     */
-    public function testCopyPaste()
-    {
-        $reportFile = self::$reportDir . '/phpcpd_report.xml';
-        $copyPasteDetector = new CopyPasteDetector($reportFile);
-
-        if (!$copyPasteDetector->canRun()) {
-            $this->markTestSkipped('PHP Copy/Paste Detector is not available.');
-        }
-
-        $blackList = [];
-        foreach (glob(__DIR__ . '/_files/phpcpd/blacklist/*.txt') as $list) {
-            $blackList[] = file($list, FILE_IGNORE_NEW_LINES);
-        }
-        $blackList = array_merge([], ...$blackList);
-
-        $copyPasteDetector->setBlackList($blackList);
-
-        $result = $copyPasteDetector->run([BP]);
-
-        $output = file_exists($reportFile) ? file_get_contents($reportFile) : '';
-
-        $this->assertTrue(
-            $result,
-            "PHP Copy/Paste Detector has found error(s):" . PHP_EOL . $output
-        );
-    }
-
-    /**
-     * Tests whitelisted files for strict type declarations.
-     */
-    public function testStrictTypes()
-    {
-        $changedFiles = AddedFiles::getAddedFilesList(self::getChangedFilesBaseDir());
-
-        try {
-            $blackList = Files::init()->readLists(
-                self::getBaseFilesFolder() . '/_files/blacklist/strict_type.txt'
-            );
-        } catch (\Exception $e) {
-            // nothing matched black list
-            $blackList = [];
-        }
-
-        $toBeTestedFiles = array_diff(
-            self::filterFiles($changedFiles, ['php'], []),
-            $blackList
-        );
-
-        $filesMissingStrictTyping = [];
-        foreach ($toBeTestedFiles as $fileName) {
-            $file = file_get_contents($fileName);
-            if (strstr($file, 'strict_types=1') === false) {
-                $filesMissingStrictTyping[] = $fileName;
-            }
-        }
-
-        $this->assertCount(
-            0,
-            $filesMissingStrictTyping,
-            "Following files are missing strict type declaration:"
-            . PHP_EOL
-            . implode(PHP_EOL, $filesMissingStrictTyping)
-        );
-    }
-
-    /**
-     * Test for compatibility to lowest PHP version declared in <kbd>composer.json</kbd>.
-     */
-    public function testPhpCompatibility()
-    {
-        $targetVersions = $this->getTargetPhpVersions();
-        $this->assertNotEmpty($targetVersions, 'No supported versions information in composer.json');
-        $reportFile    = self::$reportDir . '/phpcompatibility_report.txt';
-        $rulesetDir    = __DIR__ . '/_files/PHPCompatibilityMagento';
-
-        if (!file_exists($reportFile)) {
-            touch($reportFile);
-        }
-
-        $codeSniffer = new PhpCompatibility($rulesetDir, $reportFile, new Wrapper());
-        if (count($targetVersions) > 1) {
-            $codeSniffer->setTestVersion($targetVersions[0] . '-' . $targetVersions[1]);
-        } else {
-            $codeSniffer->setTestVersion($targetVersions[0]);
-        }
-
-        $result = $codeSniffer->run(
-            $this->isFullScan() ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml'])
-        );
-        $report = file_get_contents($reportFile);
-
-        $this->assertEquals(
-            0,
-            $result,
-            'PHP Compatibility detected violation(s):' . PHP_EOL . $report
-        );
-    }
-
-    /**
-     * Test code quality using PHPStan
-     *
-     * @throws \Exception
-     */
-    public function testPhpStan()
-    {
-        $reportFile = self::$reportDir . '/phpstan_report.txt';
-        $confFile = __DIR__ . '/_files/phpstan/phpstan.neon';
-
-        if (!file_exists($reportFile)) {
-            touch($reportFile);
-        }
-
-        $fileList = self::getWhitelist(['php']);
-        $blackList = Files::init()->readLists(__DIR__ . '/_files/phpstan/blacklist/*.txt');
-        if ($blackList) {
-            $blackListPattern = sprintf('#(%s)#i', implode('|', $blackList));
-            $fileList = array_filter(
-                $fileList,
-                function ($path) use ($blackListPattern) {
-                    return !preg_match($blackListPattern, $path);
-                }
-            );
-        }
-
-        $phpStan = new PhpStan($confFile, $reportFile);
-        $exitCode = $phpStan->run($fileList);
-        $report = file_get_contents($reportFile);
-
-        $errorMessage = empty($report) ?
-            'PHPStan command run failed.' : 'PHPStan detected violation(s):' . PHP_EOL . $report;
-        $this->assertEquals(0, $exitCode, $errorMessage);
-    }
-
-    /**
-     * Tests whitelisted fixtures for reuse other fixtures.
-     */
-    public function testFixtureReuse()
-    {
-        $changedFiles =  self::getWhitelist(['php']);
-        $toBeTestedFiles = self::filterFiles($changedFiles, ['php'], []);
-
-        $filesWithIncorrectReuse = [];
-        foreach ($toBeTestedFiles as $fileName) {
-            //check only _files and Fixtures directory
-            if (!preg_match('/integration.+\/(_files|Fixtures)/', $fileName)) {
-                continue;
-            }
-            $file = str_replace(["\n", "\r"], '', file_get_contents($fileName));
-            if (preg_match('/(?<![\=\s*])\b(require|require_once|include)\b/', $file)) {
-                $filesWithIncorrectReuse[] = $fileName;
-            }
-        }
-
-        $this->assertEquals(
-            0,
-            count($filesWithIncorrectReuse),
-            "The following files incorrectly reuse fixtures:"
-            . PHP_EOL
-            . implode(PHP_EOL, $filesWithIncorrectReuse)
-            . PHP_EOL
-            . 'Please use Magento\TestFramework\Workaround\Override\Fixture\Resolver::requireDataFixture'
-        );
-    }
-}
diff --git a/dev/tests/static/testsuite/Magento/Test/Local/_files/PHPCompatibilityMagento/ruleset.xml b/dev/tests/static/testsuite/Magento/Test/Local/_files/PHPCompatibilityMagento/ruleset.xml
deleted file mode 100644
index 579a6d2416f20..0000000000000
--- a/dev/tests/static/testsuite/Magento/Test/Local/_files/PHPCompatibilityMagento/ruleset.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<ruleset name="PHPCompatibilityMagento">
-    <description>Magento 2 specific ruleset which checks for PHP cross version compatibility.</description>
-    <rule ref="PHPCompatibility">
-        <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
-    </rule>
-</ruleset>
diff --git a/dev/tests/static/testsuite/Magento/Test/Local/_files/blacklist/strict_type.txt b/dev/tests/static/testsuite/Magento/Test/Local/_files/blacklist/strict_type.txt
deleted file mode 100644
index 877583e5b6a29..0000000000000
--- a/dev/tests/static/testsuite/Magento/Test/Local/_files/blacklist/strict_type.txt
+++ /dev/null
@@ -1 +0,0 @@
-# Format: <componentType=module|library|theme|language|*> <componentName> <globPattern> or simply <globPattern>
diff --git a/dev/tests/static/testsuite/Magento/Test/Local/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Local/_files/phpcpd/blacklist/common.txt
deleted file mode 100644
index efc7e669b3605..0000000000000
--- a/dev/tests/static/testsuite/Magento/Test/Local/_files/phpcpd/blacklist/common.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
-app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
-app/code/Magento/Backend/Test/Unit/Model/_files/
-app/code/Magento/Bundle
-app/code/Magento/Catalog/Model/Product/Visibility.php
-app/code/Magento/Catalog/Model/Product/Attribute/Source/Status.php
-app/code/Magento/Catalog/Model/Category.php
-app/code/Magento/Catalog/Model/ResourceModel/Product/Link/SaveHandler.php
-dev
-lib/internal/Magento/Framework/DB/Select/RendererProxy.php
-lib/internal/Magento/Framework/DB/Query/Generator.php
-app/code/Magento/Paypal/Model/Method/Agreement.php
-app/code/Magento/Paypal/Test/Unit/Model/_files/additional_info_data.php
-app/code/Magento/Downloadable/Model/Link.php
-app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php
-app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php
-app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
-app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
-app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
-app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
-app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
-app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php
-app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Auto.php
-app/code/Magento/Sales/Model/Order/Pdf/
-app/code/Magento/Sales/Model/Order/CreditmemoRepository.php
-app/code/Magento/Sales/Model/Order/Email/Container/
-app/code/Magento/Sales/Model/Order/Invoice.php
-app/code/Magento/Sales/Model/Order/Invoice/Item.php
-app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
-app/code/Magento/Sales/Model/Order/ShipmentRepository.php
-app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Relation/Refund.php
-app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
-app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
-app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
-app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php
-app/code/Magento/Shipping/Block/Order/Shipment.php
-app/code/Magento/Sales/Block/Order/Creditmemo.php
-app/code/Magento/Sales/Block/Order/Invoice.php
-app/code/Magento/Sales/Block/Order/PrintOrder/Creditmemo.php
-app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php
-app/code/Magento/AdvancedCheckout/Controller/Adminhtml/Index/ConfigureQuoteItems.php
-app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
-app/code/Magento/Cron/Model/Config/Backend/Product/Alert.php
-app/code/Magento/Customer/Controller/Adminhtml/Address/Viewfile.php
-app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
-app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
-app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
-app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
-app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php
-app/code/Magento/ProductAlert/Model/Observer.php
-app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php
-app/code/Magento/Reports/Model/ResourceModel/Customer/Totals/Collection.php
-app/code/Magento/Review/Block/Customer/View.php
-app/code/Magento/Rule/Test/Mftf/Helper/RuleHelper.php
-app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus/Form.php
-app/code/Magento/Sales/Model/ResourceModel/Collection/AbstractCollection.php
-app/code/Magento/Sales/Model/ResourceModel/Report/
-app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
-app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
-app/code/Magento/CatalogRule/Model/ResourceModel/SaveHandler.php
-lib/internal/Magento/Framework/HTTP/Client/Socket.php
-lib/internal/Magento/Framework/App/Config/Scope/Validator.php
-app/code/Magento/Cron/Model/Schedule.php
-generated/code
-lib/internal/Magento/Framework/Filesystem/Driver/File/Mime.php
-app/code/Magento/Shipping/Model/Rate/PackageResult.php
-app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
-app/code/Magento/Ui/Config/Converter/Url.php
-app/code/Magento/Ui/Config/Converter/Buttons.php
-app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
-app/code/Magento/Sales/Api/Data/CreditmemoItemInterface.php
-vendor
-lib/internal/Magento/Framework/DataObject/Copy/Config/Data/Proxy.php
-app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWebsiteAttributes.php
-app/code/Magento/CatalogUrlRewrite/Setup/Recurring.php
-app/code/Magento/Checkout/Setup/Patch/Data/PrepareInitialCheckoutConfiguration.php
-app/code/Magento/ConfigurableProduct/Setup/Recurring.php
-app/code/Magento/Sales/Setup/SalesSetup.php
-app/code/Magento/Weee/Setup/Recurring.php
-app/code/Magento/Wishlist/Setup/Recurring.php
-setup/src/Magento/Setup/Fixtures
-app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Rows.php
-app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
-app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
-app/code/Magento/Catalog/Ui/Component/Listing/
-app/code/Magento/Payment/Gateway/Data/Order/AddressAdapter.php
-app/code/Magento/SalesRule/Model/CouponRepository.php
-app/code/Magento/SalesRule/Test/Unit/Model/Rule/Metadata/_files/MetaData.php
-app/code/Magento/Tax/Model/Calculation/UnitBaseCalculator.php
-app/code/Magento/Customer/Block/Widget/
-app/code/Magento/Persistent/Observer/EmulateCustomerObserver.php
-app/code/Magento/Eav/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor.php
-lib/internal/Magento/Framework/App/AreaList/Proxy.php
-lib/internal/Magento/Framework/App/Route/ConfigInterface/Proxy.php
-lib/internal/Magento/Framework/Backup/Filesystem/Iterator/Filter.php
-app/code/Magento/Theme/Model/Indexer/Design/Config.php
-lib/internal/Magento/Framework/Mview/Config/Data/Proxy.php
-lib/internal/Magento/Framework/View/File/Collector/Override
-lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem/
-lib/internal/Magento/Framework/MessageQueue/Publisher/Config/PublisherConfigItem/Iterator.php
-lib/internal/Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem/Iterator.php
-app/code/Magento/Integration/Model/IntegrationConfig.php
-*Test.php
-Test/_files
-Test/Unit/_files
-Test/Integration/_files
-app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
-app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/CompositeResolver.php
-app/code/Magento/Elasticsearch/Model/Layer/Search/ItemCollectionProvider.php
-app/code/Magento/Newsletter/Model/Queue/TransportBuilder.php
-app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
diff --git a/dev/tests/static/testsuite/Magento/Test/Local/_files/phpcpd/blacklist/inventory.txt b/dev/tests/static/testsuite/Magento/Test/Local/_files/phpcpd/blacklist/inventory.txt
deleted file mode 100644
index 0a12e975e097e..0000000000000
--- a/dev/tests/static/testsuite/Magento/Test/Local/_files/phpcpd/blacklist/inventory.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-app/code/Magento/InventoryBundleProductIndexer/Indexer/SelectBuilder.php
-app/code/Magento/InventoryConfigurableProductIndexer/Indexer/SelectBuilder.php
-app/code/Magento/InventoryCatalogAdminUi/Controller/Adminhtml/Source/BulkAssignPost.php
-app/code/Magento/InventoryBundleProductIndexer/Indexer/SourceItem/SourceItemIndexer.php
-app/code/Magento/InventoryShippingAdminUi/Ui/DataProvider/GetSourcesByOrderIdSkuAndQty.php
-app/code/Magento/InventoryBundleProductIndexer/Indexer/SourceItem/SiblingSkuListInStockProvider.php
-app/code/Magento/InventoryInStorePickupWebapiExtension/Model/Rest/Swagger/Generator.php
-app/code/Magento/InventoryAdminUi/Controller/Adminhtml/Source/MassDisable.php
-app/code/Magento/InventoryBundleProductIndexer/Indexer/StockIndexer.php
-app/code/Magento/InventoryBundleProductIndexer/Indexer/SelectBuilder.php
-app/code/Magento/InventoryConfigurableProductIndexer/Indexer/SourceItem/SiblingSkuListInStockProvider.php
diff --git a/dev/tests/static/testsuite/Magento/Test/Local/_files/phpmd/ruleset.xml b/dev/tests/static/testsuite/Magento/Test/Local/_files/phpmd/ruleset.xml
deleted file mode 100644
index 0e3b5fa3d341c..0000000000000
--- a/dev/tests/static/testsuite/Magento/Test/Local/_files/phpmd/ruleset.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<ruleset name="Magento PHPMD rule set" xmlns="http://pmd.sf.net/ruleset/1.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
-         xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-    <description>Magento Code Check Rules</description>
-    <php-includepath>../../../../../../framework</php-includepath>
-
-    <!-- Code Size Rules -->
-    <rule ref="rulesets/codesize.xml/CyclomaticComplexity" />
-    <rule ref="rulesets/codesize.xml/NPathComplexity" />
-    <rule ref="rulesets/codesize.xml/ExcessiveMethodLength" />
-    <rule ref="rulesets/codesize.xml/ExcessiveParameterList" />
-    <rule ref="rulesets/codesize.xml/ExcessivePublicCount" />
-    <rule ref="rulesets/codesize.xml/TooManyFields" />
-    <rule ref="rulesets/codesize.xml/ExcessiveClassComplexity">
-        <properties>
-            <property name="maximum" value="100" />
-        </properties>
-    </rule>
-
-    <!-- Unused code rules -->
-    <rule ref="rulesets/unusedcode.xml" />
-
-    <!-- Code design rules -->
-    <rule ref="rulesets/design.xml/NumberOfChildren" />
-    <rule ref="rulesets/design.xml/DepthOfInheritance">
-        <properties>
-            <property name="minimum" value="8" />
-        </properties>
-    </rule>
-    <rule ref="rulesets/design.xml/CouplingBetweenObjects" />
-
-    <!-- Naming Rules -->
-    <rule ref="rulesets/naming.xml/ShortMethodName" />
-    <rule ref="rulesets/naming.xml/ConstantNamingConventions" />
-    <rule ref="rulesets/naming.xml/BooleanGetMethodName" />
-
-    <!-- Magento Specific Rules -->
-    <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/AllPurposeAction" />
-    <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/CookieAndSessionMisuse" />
-
-</ruleset>
diff --git a/dev/tests/static/testsuite/Magento/Test/Local/_files/phpstan/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Local/_files/phpstan/blacklist/common.txt
deleted file mode 100644
index 6b0007f58830b..0000000000000
--- a/dev/tests/static/testsuite/Magento/Test/Local/_files/phpstan/blacklist/common.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Format: path to directory or path to file
-#
-# Example:
-# app/code/Magento/Catalog
-# dev/tests/static/framework/bootstrap.php
-lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
-lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
-lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/InterceptorTest.php
-lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php
-dev/tests/integration/framework/deployTestModules.php
-dev/tests/integration/testsuite/Magento/Framework/Code/Generator/AutoloaderTest.php
-dev/tests/integration/testsuite/Magento/Framework/Communication/ConfigTest.php
-dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/SimpleDirectiveTest.php
-dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php
-dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
-dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/AbstractFiltersTest.php
-dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/CategoryTest.php
-dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.php
-dev/tests/api-functional/testsuite/Magento/Framework/Model/Entity/HydratorTest.php
-dev/tests/api-functional/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php
-dev/tests/api-functional/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php
-app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php
-app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolverTest.php
diff --git a/dev/tests/static/testsuite/Magento/Test/Local/_files/phpstan/phpstan.neon b/dev/tests/static/testsuite/Magento/Test/Local/_files/phpstan/phpstan.neon
deleted file mode 100644
index aba7d0b46d297..0000000000000
--- a/dev/tests/static/testsuite/Magento/Test/Local/_files/phpstan/phpstan.neon
+++ /dev/null
@@ -1,49 +0,0 @@
-parameters:
-    checkExplicitMixedMissingReturn: true
-    checkPhpDocMissingReturn: true
-    reportUnmatchedIgnoredErrors: false
-    excludes_analyse:
-        - %rootDir%/../../../lib/internal/Magento/Framework/ObjectManager/Test/Unit/*
-        - %rootDir%/../../../*/_files/*
-        - %rootDir%/../../../dev/tests/*/Fixtures/*
-        - %rootDir%/../../../dev/tests/*/tmp/*
-        - %rootDir%/../../../dev/tests/*/_generated/*
-        - %rootDir%/../../../pub/*
-    scanDirectories:
-        - %rootDir%/../../../dev/tests/static/framework/tests/unit/testsuite/Magento
-        - %rootDir%/../../../dev/tests/integration/framework/tests/unit/testsuite/Magento
-        - %rootDir%/../../../dev/tests/api-functional/_files/Magento
-    bootstrapFiles:
-            - %rootDir%/../../../dev/tests/static/framework/autoload.php
-            - %rootDir%/../../../dev/tests/integration/framework/autoload.php
-            - %rootDir%/../../../dev/tests/api-functional/framework/autoload.php
-            - %rootDir%/../../../dev/tests/setup-integration/framework/autoload.php
-            - %rootDir%/../../../dev/tests/static/framework/Magento/PhpStan/autoload.php
-    ignoreErrors:
-        # Ignore PHPStan\Rules\Classes\UnusedConstructorParametersRule
-        - '#Constructor of class [a-zA-Z0-9\\_]+ has an unused parameter#'
-        # Ignore setCustomErrorHandler function not found in bootstrap files
-        - '#Function setCustomErrorHandler not found#'
-        # Ignore 'return statement is missing' error when 'void' is present in return type list
-        - '#Method (?:.*?) should return (?:.*?)void(?:.*?) but return statement is missing.#'
-        # Ignore constants, defined dynamically.
-        - '#Constant TESTS_WEB_API_ADAPTER not found.#'
-        - '#Constant TESTS_BASE_URL not found.#'
-        - '#Constant TESTS_XDEBUG_ENABLED not found.#'
-        - '#Constant TESTS_XDEBUG_SESSION not found.#'
-        - '#Constant INTEGRATION_TESTS_DIR not found.#'
-        - '#Constant MAGENTO_MODULES_PATH not found.#'
-        - '#Constant TESTS_MODULES_PATH not found.#'
-        - '#Constant TESTS_INSTALLATION_DB_CONFIG_FILE not found.#'
-        - '#Constant T_[A-Z_]+ not found.#'
-
-
-services:
-    -
-        class: Magento\PhpStan\Reflection\Php\DataObjectClassReflectionExtension
-        tags: {phpstan.broker.methodsClassReflectionExtension: {priority: 100}}
-
-    errorFormatter.filtered:
-        class: Magento\PhpStan\Formatters\FilteredErrorFormatter
-        arguments:
-            tableErrorFormatter: @errorFormatter.table
diff --git a/dev/tests/static/testsuite/Magento/Test/Local/_files/whitelist/common.txt b/dev/tests/static/testsuite/Magento/Test/Local/_files/whitelist/common.txt
deleted file mode 100644
index ffb7d924f9d5a..0000000000000
--- a/dev/tests/static/testsuite/Magento/Test/Local/_files/whitelist/common.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Format: <componentType=module|library|theme|language|*> <componentName> <globPattern> or simply <globPattern>
-app/code/Magento/Catalog/Setup/Patch/Data/UpdateMultiselectAttributesBackendTypes.php

From ddc95cc7aa0a691225c8eb8f905f735a0ee971e4 Mon Sep 17 00:00:00 2001
From: Jakub Winkler <jakub@qsolutionsstudio.com>
Date: Mon, 20 Sep 2021 07:07:10 +0200
Subject: [PATCH 16/87] #33486 - restoring @magentoAppIsolation to class

---
 .../Model/ResourceModel/Product/Indexer/Eav/SourceTest.php     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
index 7e7b311625df2..24d9d56fb0df7 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
@@ -14,6 +14,9 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Api\Data\StoreInterface;
 
+/**
+ * @magentoAppIsolation enabled
+ */
 class SourceTest extends \PHPUnit\Framework\TestCase
 {
     /**

From ddab158144b1e4cc6971bea51beb8c25cc2ebc07 Mon Sep 17 00:00:00 2001
From: Jakub Winkler <jakub@qsolutionsstudio.com>
Date: Mon, 20 Sep 2021 08:18:22 +0200
Subject: [PATCH 17/87] 33468 - restroing phpmd supressed warning

---
 .../Model/ResourceModel/Product/Indexer/Eav/SourceTest.php       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
index 24d9d56fb0df7..0e30015d98163 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php
@@ -16,6 +16,7 @@
 
 /**
  * @magentoAppIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SourceTest extends \PHPUnit\Framework\TestCase
 {

From b605562fabb6ac9b434b1fddd3b40f3610e7795e Mon Sep 17 00:00:00 2001
From: AZiniukhin <a.ziniukhin@atwix.com>
Date: Thu, 23 Sep 2021 11:28:14 +0300
Subject: [PATCH 18/87] Fixed error DOT field with Portugal locale

---
 app/code/Magento/Customer/Block/Widget/Dob.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/app/code/Magento/Customer/Block/Widget/Dob.php
index ef2d2cca169f5..919db404df175 100644
--- a/app/code/Magento/Customer/Block/Widget/Dob.php
+++ b/app/code/Magento/Customer/Block/Widget/Dob.php
@@ -422,7 +422,8 @@ public function getTranslatedCalendarConfigJson(): string
                 'monthNamesShort' => array_values(iterator_to_array($monthsData['format']['abbreviated'])),
                 'dayNames' => array_values(iterator_to_array($daysData['format']['wide'])),
                 'dayNamesShort' => array_values(iterator_to_array($daysData['format']['abbreviated'])),
-                'dayNamesMin' => array_values(iterator_to_array($daysData['format']['short'])),
+                'dayNamesMin' => array_values(iterator_to_array(
+                    ($daysData['format']['short']) ?: $daysData['format']['abbreviated'])),
             ]
         );
     }

From b6a7c44c8ed85a9a73b93cf2b46ab2d32ff67f31 Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Fri, 24 Sep 2021 15:27:39 +0530
Subject: [PATCH 19/87] AC-122::Paypal Admin: PayLater -> Pay Later

---
 .../Paypal/etc/adminhtml/system/express_checkout.xml      | 8 ++++----
 .../system/paypal_payflowpro_with_express_checkout.xml    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 3389b072daff2..dad46b7d5c3a1 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -184,10 +184,10 @@
                 </depends>
             </field>
             <field id="enable_paypal_paylater_experience" translate="label comment" type="select" sortOrder="27" showInDefault="1" showInWebsite="1">
-                <label>Enable PayPal PayLater Experience</label>
+                <label>Enable PayPal Pay Later Experience</label>
                 <comment>
                     <![CDATA[Recommended. <strong>Advertise PayPal Credit</strong> is deprecated.
-                    See PayPal PayLater details and list of supported regions
+                    See PayPal Pay Later details and list of supported regions
                     <a href="https://developer.paypal.com/docs/business/pay-later/us/#eligibility" target="_blank">
                     here</a>.]]>
                 </comment>
@@ -331,9 +331,9 @@
                 </group>
             </group>
             <group id="advertise_paylater" translate="label" showInDefault="1" showInWebsite="1" sortOrder="40">
-                <label>Advertise PayPal PayLater</label>
+                <label>Advertise PayPal Pay Later</label>
                 <field id="paylater_enabled" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
-                    <label>Enable PayPal PayLater</label>
+                    <label>Enable PayPal Pay Later</label>
                     <config_path>payment/paypal_paylater/enabled</config_path>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
index 070bedce7c26f..d8cc87a235828 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
@@ -150,7 +150,7 @@
                 </group>
             </group>
             <group id="paypal_payflow_advertise_paylater"  translate="label" showInDefault="1" showInWebsite="1" sortOrder="60">
-                <label>Advertise PayPal PayLater</label>
+                <label>Advertise PayPal Pay Later</label>
                 <field id="paylater_enabled" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/paylater_enabled" />
                 <depends>
                     <field id="enable_paypal_paylater_experience">1</field>

From 44d0cd2b9ce01ad43865e4e9921aa7fe92c9d738 Mon Sep 17 00:00:00 2001
From: abhattGlo <glo36217@adobe.com>
Date: Mon, 27 Sep 2021 11:32:23 +0530
Subject: [PATCH 20/87] AC-1224::PayLater advertising(Admin UI) position text
 change to Under PayPal Checkout buttons

---
 .../Paypal/Model/System/Config/Source/PayLater/Position.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/PayLater/Position.php b/app/code/Magento/Paypal/Model/System/Config/Source/PayLater/Position.php
index af86fd2bcf03a..3dcc48891e6b8 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/PayLater/Position.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/PayLater/Position.php
@@ -21,7 +21,7 @@ public function getPositionsCPP(): array
     {
         return [
             'header' => __('Header (center)'),
-            'near_pp_button' => __('Near PayPal Credit checkout button')
+            'near_pp_button' => __('Under PayPal Checkout buttons')
         ];
     }
 
@@ -46,7 +46,7 @@ public function getPositionsHP(): array
     public function getPositionsCheckout(): array
     {
         return [
-            'near_pp_button' => __('Near PayPal Credit checkout button')
+            'near_pp_button' => __('Under PayPal Checkout buttons')
         ];
     }
 
@@ -72,7 +72,7 @@ public function getPositionsCart(): array
     {
         return [
             'header' => __('Header (center)'),
-            'near_pp_button' => __('Near PayPal Credit checkout button')
+            'near_pp_button' => __('Under PayPal Checkout buttons')
         ];
     }
 }

From 2fd31d4730c31ebbd7d9f090babb1dcde1bbe590 Mon Sep 17 00:00:00 2001
From: glo5363 <glo05363@adobe.com>
Date: Wed, 29 Sep 2021 15:05:10 +0530
Subject: [PATCH 21/87] AC-1225 Sandbox Testing ONLY Add buyer-country param

---
 app/code/Magento/Paypal/Model/Config.php      |  11 +-
 app/code/Magento/Paypal/Model/SdkUrl.php      |  17 +-
 .../Paypal/Test/Unit/Model/SdkUrlTest.php     |   9 +-
 .../Unit/Model/_files/expected_url_config.php |  56 +-
 .../etc/adminhtml/system/express_checkout.xml | 654 ++++++++++++------
 5 files changed, 529 insertions(+), 218 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index d08c7db4f3db7..0fe4a1c6be6c1 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -12,7 +12,6 @@
  * Config model that is aware of all \Magento\Paypal payment methods
  *
  * Works with PayPal-specific system configuration
-
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
@@ -620,7 +619,8 @@ public function __construct(
         \Magento\Payment\Model\Source\CctypeFactory $cctypeFactory,
         \Magento\Paypal\Model\CertFactory $certFactory,
         $params = []
-    ) {
+    )
+    {
         parent::__construct($scopeConfig);
         $this->directoryHelper = $directoryHelper;
         $this->_storeManager = $storeManager;
@@ -840,7 +840,7 @@ public function getCountryMethods($countryCode = null)
     public function getPayPalBasicStartUrl($token)
     {
         $params = [
-            'cmd'   => '_express-checkout',
+            'cmd' => '_express-checkout',
             'token' => $token,
         ];
 
@@ -1519,6 +1519,7 @@ protected function _mapExpressFieldset($fieldName)
             case 'merchant_id':
             case 'client_id':
             case 'sandbox_client_id':
+            case 'buyer_country':
             case 'supported_locales':
             case 'smart_buttons_supported_locales':
                 return "payment/{$this->_methodCode}/{$fieldName}";
@@ -1615,8 +1616,8 @@ protected function _mapWpukFieldset($fieldName)
         if ($this->_methodCode == self::METHOD_WPP_PE_EXPRESS && $this->isMethodAvailable(self::METHOD_PAYFLOWLINK)) {
             $pathPrefix = 'payment/payflow_link';
         } elseif ($this->_methodCode == self::METHOD_WPP_PE_EXPRESS && $this->isMethodAvailable(
-            self::METHOD_PAYFLOWADVANCED
-        )
+                self::METHOD_PAYFLOWADVANCED
+            )
         ) {
             $pathPrefix = 'payment/payflow_advanced';
         } elseif ($this->_methodCode == self::METHOD_WPP_PE_EXPRESS) {
diff --git a/app/code/Magento/Paypal/Model/SdkUrl.php b/app/code/Magento/Paypal/Model/SdkUrl.php
index e10f4ce2e886b..59e28eb5fed40 100644
--- a/app/code/Magento/Paypal/Model/SdkUrl.php
+++ b/app/code/Magento/Paypal/Model/SdkUrl.php
@@ -82,7 +82,8 @@ public function __construct(
         StoreManagerInterface $storeManager,
         $disallowedFundingMap = [],
         $unsupportedPaymentMethods = []
-    ) {
+    )
+    {
         $this->localeResolver = $localeResolver;
         $this->config = $configFactory->create();
         $this->config->setMethod(Config::METHOD_EXPRESS);
@@ -116,6 +117,7 @@ public function getUrl(): string
                 $params['intent'] = $this->getIntent();
                 $params['merchant-id'] = $this->config->getValue('merchant_id');
                 $params['disable-funding'] = $this->getDisallowedFunding();
+                $params['buyer-country'] = $this->getBuyerCountry();
                 $params = array_replace($params, $this->queryParams);
             }
             $params['components'] = implode(',', $components);
@@ -156,7 +158,7 @@ private function areMessagesEnabled()
      */
     private function areButtonsEnabled()
     {
-        return (bool)(int) $this->config->getValue('in_context');
+        return (bool)(int)$this->config->getValue('in_context');
     }
 
     /**
@@ -171,6 +173,17 @@ private function getClientId()
             $this->config->getValue('client_id');
     }
 
+    /**
+     * get Configured value for paypal buyer country
+     * @return string
+     */
+    private function getBuyerCountry()
+    {
+        return (int)$this->config->getValue('sandbox_flag') ?
+            $this->config->getValue('buyer_country') :
+            '';
+    }
+
     /**
      * Returns disallowed funding from configuration after updating values
      *
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php b/app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php
index 3b29017f494c4..b6aec6328acec 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php
@@ -85,6 +85,7 @@ protected function setUp(): void
      * @param string $locale
      * @param string $intent
      * @param string|null $disallowedFunding
+     * @param bool $isBuyerCountryEnabled
      * @param bool $isPaypalGuestCheckoutEnabled
      * @param array $expected
      * @dataProvider getConfigDataProvider
@@ -93,9 +94,11 @@ public function testGetConfig(
         string $locale,
         string $intent,
         ?string $disallowedFunding,
+        bool $isBuyerCountryEnabled,
         bool $isPaypalGuestCheckoutEnabled,
         array $expected
-    ) {
+    )
+    {
         $this->localeResolverMock->method('getLocale')->willReturn($locale);
         $this->configMock->method('getValue')->willReturnMap(
             [
@@ -103,6 +106,7 @@ public function testGetConfig(
                 ['sandbox_client_id', null, 'sb'],
                 ['sandbox_flag', null, true],
                 ['disable_funding_options', null, $disallowedFunding],
+                ['buyer_country', null, $isBuyerCountryEnabled ? 'US' : ''],
                 ['paymentAction', null, $intent],
                 ['in_context', null, true],
                 [
@@ -112,7 +116,6 @@ public function testGetConfig(
                 ],
             ]
         );
-
         self::assertEquals($expected['sdkUrl'], $this->model->getUrl());
     }
 
@@ -150,7 +153,7 @@ private function getDisallowedFundingMap()
     private function getUnsupportedPaymentMethods()
     {
         return [
-            'venmo'=> 'venmo',
+            'venmo' => 'venmo',
             'bancontact' => 'bancontact',
             'eps' => 'eps',
             'giropay' => 'giropay',
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
index 52d488104f059..22d647473acba 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
@@ -10,7 +10,7 @@
  * @param array $params
  * @return String
  */
-function generateExpectedPaypalSdkUrl(array $params) : String
+function generateExpectedPaypalSdkUrl(array $params): string
 {
     return 'https://www.paypal.com/sdk/js?' . http_build_query($params);
 }
@@ -20,6 +20,7 @@ function generateExpectedPaypalSdkUrl(array $params) : String
         'es_MX',
         'Authorization',
         'CREDIT,ELV,CARD',
+        false,
         true,
         [
             'sdkUrl' => generateExpectedPaypalSdkUrl(
@@ -55,6 +56,7 @@ function generateExpectedPaypalSdkUrl(array $params) : String
         'en_BR',
         'Sale',
         null,
+        false,
         true,
         [
             'sdkUrl' => generateExpectedPaypalSdkUrl(
@@ -78,6 +80,7 @@ function generateExpectedPaypalSdkUrl(array $params) : String
         'en_US',
         'Order',
         null,
+        false,
         true,
         [
             'sdkUrl' => generateExpectedPaypalSdkUrl(
@@ -102,6 +105,7 @@ function generateExpectedPaypalSdkUrl(array $params) : String
         'Authorization',
         'CREDIT,ELV',
         false,
+        false,
         [
             'sdkUrl' => generateExpectedPaypalSdkUrl(
                 [
@@ -136,6 +140,56 @@ function generateExpectedPaypalSdkUrl(array $params) : String
         'en_BR',
         'Authorization',
         'CREDIT,ELV',
+        false,
+        true,
+        [
+            'sdkUrl' => generateExpectedPaypalSdkUrl(
+                [
+                    'client-id' => 'sb',
+                    'locale' => 'en_BR',
+                    'currency' => 'USD',
+                    'commit' => 'false',
+                    'intent' => 'authorize',
+                    'merchant-id' => 'merchant',
+                    'disable-funding' => implode(
+                        ',',
+                        ['credit', 'sepa', 'venmo', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
+                    ),
+                    'components' => implode(',', ['messages', 'buttons'])
+                ]
+            )
+        ]
+    ],
+    'buyer_country_enabled' => [
+        'en_BR',
+        'Authorization',
+        'CREDIT,ELV',
+        true,
+        true,
+        [
+            'sdkUrl' => generateExpectedPaypalSdkUrl(
+                [
+                    'client-id' => 'sb',
+                    'locale' => 'en_BR',
+                    'currency' => 'USD',
+                    'commit' => 'false',
+                    'intent' => 'authorize',
+                    'merchant-id' => 'merchant',
+                    'disable-funding' => implode(
+                        ',',
+                        ['credit', 'sepa', 'venmo', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
+                    ),
+                    'buyer-country' => 'US',
+                    'components' => implode(',', ['messages', 'buttons'])
+                ]
+            )
+        ]
+    ],
+    'buyer_country_disabled' => [
+        'en_BR',
+        'Authorization',
+        'CREDIT,ELV',
+        false,
         true,
         [
             'sdkUrl' => generateExpectedPaypalSdkUrl(
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 3389b072daff2..4af5a5e3e6c40 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -5,8 +5,10 @@
  * See COPYING.txt for license details.
  */
 -->
-<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="express_checkout" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="express_checkout" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1"
+           sortOrder="60">
         <label>Express Checkout</label>
         <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>paypal-other-section</fieldset_css>
@@ -19,10 +21,12 @@
         <group id="express_checkout_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
             <label>Required PayPal Settings</label>
             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-            <group id="express_checkout_required_express_checkout" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
+            <group id="express_checkout_required_express_checkout" translate="label" showInDefault="1" showInWebsite="1"
+                   sortOrder="10">
                 <label>Express Checkout</label>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                <field id="business_account" translate="label comment tooltip" showInDefault="1" showInWebsite="1" sortOrder="5">
+                <field id="business_account" translate="label comment tooltip" showInDefault="1" showInWebsite="1"
+                       sortOrder="5">
                     <label>Email Associated with PayPal Merchant Account (Optional)</label>
                     <frontend_class>not-required</frontend_class>
                     <comment>
@@ -33,25 +37,29 @@
                     <validate>validate-email</validate>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="api_authentication" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
+                <field id="api_authentication" translate="label" type="select" sortOrder="20" showInDefault="1"
+                       showInWebsite="1">
                     <label>API Authentication Methods</label>
                     <config_path>paypal/wpp/api_authentication</config_path>
                     <source_model>Magento\Paypal\Model\Config::getApiAuthenticationMethods</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="api_username" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
+                <field id="api_username" translate="label" type="obscure" sortOrder="30" showInDefault="1"
+                       showInWebsite="1">
                     <label>API Username</label>
                     <config_path>paypal/wpp/api_username</config_path>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="api_password" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1">
+                <field id="api_password" translate="label" type="obscure" sortOrder="40" showInDefault="1"
+                       showInWebsite="1">
                     <label>API Password</label>
                     <config_path>paypal/wpp/api_password</config_path>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="api_signature" translate="label" type="obscure" sortOrder="50" showInDefault="1" showInWebsite="1">
+                <field id="api_signature" translate="label" type="obscure" sortOrder="50" showInDefault="1"
+                       showInWebsite="1">
                     <label>API Signature</label>
                     <config_path>paypal/wpp/api_signature</config_path>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
@@ -69,7 +77,8 @@
                         <field id="api_authentication">1</field>
                     </depends>
                 </field>
-                <field id="api_wizard" translate="button_label attribute sandbox_button_label" sortOrder="70" showInDefault="1" showInWebsite="1">
+                <field id="api_wizard" translate="button_label attribute sandbox_button_label" sortOrder="70"
+                       showInDefault="1" showInWebsite="1">
 
                     <attribute type="button_label">Get Credentials from PayPal</attribute>
                     <attribute type="button_url">
@@ -97,19 +106,32 @@
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\ApiWizard</frontend_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="sandbox_flag" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
+                <field id="sandbox_flag" translate="label" type="select" sortOrder="80" showInDefault="1"
+                       showInWebsite="1">
                     <label>Sandbox Mode</label>
                     <config_path>paypal/wpp/sandbox_flag</config_path>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="use_proxy" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1">
+                <field id="buyer_country" translate="label" type="select" sortOrder="85" showInDefault="1"
+                       showInWebsite="1">
+                    <label>Buyer Country</label>
+                    <config_path>payment/paypal_express/buyer_country</config_path>
+                    <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+                    <attribute type="shared">1</attribute>
+                    <depends>
+                        <field id="sandbox_flag">1</field>
+                    </depends>
+                </field>
+                <field id="use_proxy" translate="label" type="select" sortOrder="90" showInDefault="1"
+                       showInWebsite="1">
                     <label>API Uses Proxy</label>
                     <config_path>paypal/wpp/use_proxy</config_path>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="proxy_host" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1">
+                <field id="proxy_host" translate="label" type="text" sortOrder="100" showInDefault="1"
+                       showInWebsite="1">
                     <label>Proxy Host</label>
                     <config_path>paypal/wpp/proxy_host</config_path>
                     <attribute type="shared">1</attribute>
@@ -117,7 +139,8 @@
                         <field id="use_proxy">1</field>
                     </depends>
                 </field>
-                <field id="proxy_port" translate="label comment" type="text" sortOrder="110" showInDefault="1" showInWebsite="1">
+                <field id="proxy_port" translate="label comment" type="text" sortOrder="110" showInDefault="1"
+                       showInWebsite="1">
                     <label>Proxy Port</label>
                     <comment>Please enter at least 0 and at most 65535</comment>
                     <config_path>paypal/wpp/proxy_port</config_path>
@@ -128,7 +151,8 @@
                     <validate>validate-digits validate-digits-range digits-range-0-65535</validate>
                 </field>
             </group>
-            <field id="enable_express_checkout" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
+            <field id="enable_express_checkout" translate="label" type="select" sortOrder="20" showInDefault="1"
+                   showInWebsite="1">
                 <label>Enable this Solution</label>
                 <config_path>payment/paypal_express/active</config_path>
                 <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -137,7 +161,8 @@
                     <group id="express_checkout_required_express_checkout"/>
                 </requires>
             </field>
-            <field id="enable_in_context_checkout" translate="label comment" type="select" sortOrder="21" showInDefault="1" showInWebsite="1">
+            <field id="enable_in_context_checkout" translate="label comment" type="select" sortOrder="21"
+                   showInDefault="1" showInWebsite="1">
                 <label>Enable In-Context Checkout Experience</label>
                 <comment>
                     <![CDATA[See PayPal Feature Support details and list of supported regions
@@ -152,7 +177,12 @@
             </field>
             <field id="merchant_id" translate="label" type="text" sortOrder="22" showInDefault="1" showInWebsite="1">
                 <label>Merchant Account ID</label>
-                <tooltip>You can look up your merchant ID by logging into https://www.paypal.com/. Click the profile icon on the top right side of the page and then select Profile and settings in the Business Profile menu. (If you do not see the profile icon at the top of the page, click Profile, which appears in the top menu when the My Account tab is selected.) Click My business info on the left, and the Merchant account ID is displayed in the list of profile items on the right.</tooltip>
+                <tooltip>You can look up your merchant ID by logging into https://www.paypal.com/. Click the profile
+                    icon on the top right side of the page and then select Profile and settings in the Business Profile
+                    menu. (If you do not see the profile icon at the top of the page, click Profile, which appears in
+                    the top menu when the My Account tab is selected.) Click My business info on the left, and the
+                    Merchant account ID is displayed in the list of profile items on the right.
+                </tooltip>
                 <config_path>payment/paypal_express/merchant_id</config_path>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\MerchantId</frontend_model>
                 <validate>required-entry</validate>
@@ -160,7 +190,8 @@
                     <field id="enable_in_context_checkout">1</field>
                 </depends>
             </field>
-            <field id="enable_express_checkout_bml" translate="label comment" type="select" sortOrder="23" showInDefault="0" showInWebsite="0">
+            <field id="enable_express_checkout_bml" translate="label comment" type="select" sortOrder="23"
+                   showInDefault="0" showInWebsite="0">
                 <label>Enable PayPal Credit</label>
                 <comment><![CDATA[PayPal Express Checkout lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
@@ -173,17 +204,20 @@
                     <field id="enable_express_checkout"/>
                 </requires>
             </field>
-            <field id="express_checkout_bml_sort_order" translate="label" type="text" sortOrder="25" showInDefault="0" showInWebsite="0" showInStore="0">
+            <field id="express_checkout_bml_sort_order" translate="label" type="text" sortOrder="25" showInDefault="0"
+                   showInWebsite="0" showInStore="0">
                 <label>Sort Order PayPal Credit</label>
                 <config_path>payment/paypal_express_bml/sort_order</config_path>
                 <frontend_class>validate-number</frontend_class>
                 <attribute type="shared">1</attribute>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlApiSortOrder</frontend_model>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlApiSortOrder
+                </frontend_model>
                 <depends>
                     <field id="enable_express_checkout_bml">1</field>
                 </depends>
             </field>
-            <field id="enable_paypal_paylater_experience" translate="label comment" type="select" sortOrder="27" showInDefault="1" showInWebsite="1">
+            <field id="enable_paypal_paylater_experience" translate="label comment" type="select" sortOrder="27"
+                   showInDefault="1" showInWebsite="1">
                 <label>Enable PayPal PayLater Experience</label>
                 <comment>
                     <![CDATA[Recommended. <strong>Advertise PayPal Credit</strong> is deprecated.
@@ -209,7 +243,8 @@
                 <depends>
                     <field id="enable_paypal_paylater_experience">0</field>
                 </depends>
-                <field id="bml_publisher_id" translate="label comment tooltip" showInDefault="1" showInWebsite="1" sortOrder="10">
+                <field id="bml_publisher_id" translate="label comment tooltip" showInDefault="1" showInWebsite="1"
+                       sortOrder="10">
                     <label>Publisher ID</label>
                     <comment><![CDATA[Required to display a banner]]></comment>
                     <config_path>payment/paypal_express_bml/publisher_id</config_path>
@@ -217,24 +252,30 @@
                 </field>
                 <field id="bml_wizard" translate="button_label" sortOrder="15" showInDefault="1" showInWebsite="1">
                     <button_label>Get Publisher ID from PayPal</button_label>
-                    <button_url><![CDATA[https://financing.paypal.com/ppfinportal/cart/index?dcp=4eff8563b9cc505e0b9afaff3256705081553c79]]></button_url>
+                    <button_url>
+                        <![CDATA[https://financing.paypal.com/ppfinportal/cart/index?dcp=4eff8563b9cc505e0b9afaff3256705081553c79]]></button_url>
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\BmlApiWizard</frontend_model>
                 </field>
-                <group id="settings_bml_homepage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+                <group id="settings_bml_homepage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1"
+                       sortOrder="20">
                     <label>Home Page</label>
-                    <field id="bml_homepage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
+                    <field id="bml_homepage_display" translate="label" type="select" showInDefault="1" showInWebsite="1"
+                           sortOrder="10">
                         <label>Display</label>
                         <config_path>payment/paypal_express_bml/homepage_display</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="bml_homepage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
+                    <field id="bml_homepage_position" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="20">
                         <label>Position</label>
                         <config_path>payment/paypal_express_bml/homepage_position</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsHP</source_model>
+                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsHP
+                        </source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="bml_homepage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
+                    <field id="bml_homepage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1"
+                           sortOrder="30">
                         <label>Size</label>
                         <config_path>payment/paypal_express_bml/homepage_size</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH</source_model>
@@ -243,96 +284,130 @@
                             <field id="bml_homepage_position">0</field>
                         </depends>
                     </field>
-                    <field id="bml_homepage_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_size1">
+                    <field id="bml_homepage_size2"
+                           extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_size1">
                         <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS</source_model>
                         <depends>
                             <field id="bml_homepage_position">1</field>
                         </depends>
                     </field>
                 </group>
-                <group id="settings_bml_categorypage" translate="label" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                <group id="settings_bml_categorypage" translate="label" sortOrder="30" showInDefault="1"
+                       showInWebsite="1" showInStore="1">
                     <label>Catalog Category Page</label>
-                    <field id="bml_categorypage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
+                    <field id="bml_categorypage_display" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="10">
                         <label>Display</label>
                         <config_path>payment/paypal_express_bml/categorypage_display</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="bml_categorypage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
+                    <field id="bml_categorypage_position" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="20">
                         <label>Position</label>
                         <config_path>payment/paypal_express_bml/categorypage_position</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCCP</source_model>
+                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCCP
+                        </source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="bml_categorypage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
+                    <field id="bml_categorypage_size1" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="30">
                         <label>Size</label>
                         <config_path>payment/paypal_express_bml/categorypage_size</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC</source_model>
                         <attribute type="shared">1</attribute>
-                        <depends><field id="bml_categorypage_position">0</field></depends>
+                        <depends>
+                            <field id="bml_categorypage_position">0</field>
+                        </depends>
                     </field>
-                    <field id="bml_categorypage_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_size1">
+                    <field id="bml_categorypage_size2"
+                           extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_size1">
                         <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS</source_model>
-                        <depends><field id="bml_categorypage_position">1</field></depends>
+                        <depends>
+                            <field id="bml_categorypage_position">1</field>
+                        </depends>
                     </field>
                 </group>
-                <group id="settings_bml_productpage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
+                <group id="settings_bml_productpage" translate="label" showInDefault="1" showInWebsite="1"
+                       showInStore="1" sortOrder="40">
                     <label>Catalog Product Page</label>
-                    <field id="bml_productpage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
+                    <field id="bml_productpage_display" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="10">
                         <label>Display</label>
                         <config_path>payment/paypal_express_bml/productpage_display</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="bml_productpage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
+                    <field id="bml_productpage_position" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="20">
                         <label>Position</label>
                         <config_path>payment/paypal_express_bml/productpage_position</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCPP</source_model>
+                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCPP
+                        </source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="bml_productpage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
+                    <field id="bml_productpage_size1" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="30">
                         <label>Size</label>
                         <config_path>payment/paypal_express_bml/productpage_size</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC</source_model>
                         <attribute type="shared">1</attribute>
-                        <depends><field id="bml_productpage_position">0</field></depends>
+                        <depends>
+                            <field id="bml_productpage_position">0</field>
+                        </depends>
                     </field>
-                    <field id="bml_productpage_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_size1">
+                    <field id="bml_productpage_size2"
+                           extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_size1">
                         <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN</source_model>
-                        <depends><field id="bml_productpage_position">1</field></depends>
+                        <depends>
+                            <field id="bml_productpage_position">1</field>
+                        </depends>
                     </field>
                 </group>
-                <group id="settings_bml_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
+                <group id="settings_bml_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1"
+                       sortOrder="50">
                     <label>Checkout Cart Page</label>
-                    <field id="bml_checkout_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
+                    <field id="bml_checkout_display" translate="label" type="select" showInDefault="1" showInWebsite="1"
+                           sortOrder="10">
                         <label>Display</label>
                         <config_path>payment/paypal_express_bml/checkout_display</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="bml_checkout_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
+                    <field id="bml_checkout_position" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="20">
                         <label>Position</label>
                         <config_path>payment/paypal_express_bml/checkout_position</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCheckout</source_model>
+                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCheckout
+                        </source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="bml_checkout_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
+                    <field id="bml_checkout_size1" translate="label" type="select" showInDefault="1" showInWebsite="1"
+                           sortOrder="30">
                         <label>Size</label>
                         <config_path>payment/paypal_express_bml/checkout_size</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC</source_model>
+                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC
+                        </source_model>
                         <attribute type="shared">1</attribute>
-                        <depends><field id="bml_checkout_position">0</field></depends>
+                        <depends>
+                            <field id="bml_checkout_position">0</field>
+                        </depends>
                     </field>
-                    <field id="bml_checkout_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_size1">
-                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN</source_model>
+                    <field id="bml_checkout_size2"
+                           extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_size1">
+                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN
+                        </source_model>
                         <attribute type="shared">1</attribute>
-                        <depends><field id="bml_checkout_position">1</field></depends>
+                        <depends>
+                            <field id="bml_checkout_position">1</field>
+                        </depends>
                     </field>
                 </group>
             </group>
             <group id="advertise_paylater" translate="label" showInDefault="1" showInWebsite="1" sortOrder="40">
                 <label>Advertise PayPal PayLater</label>
-                <field id="paylater_enabled" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
+                <field id="paylater_enabled" translate="label" type="select" showInDefault="1" showInWebsite="1"
+                       sortOrder="10">
                     <label>Enable PayPal PayLater</label>
                     <config_path>payment/paypal_paylater/enabled</config_path>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -341,27 +416,32 @@
                 <depends>
                     <field id="enable_paypal_paylater_experience">1</field>
                 </depends>
-                <group id="settings_paylater_homepage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+                <group id="settings_paylater_homepage" translate="label" showInDefault="1" showInWebsite="1"
+                       showInStore="1" sortOrder="20">
                     <label>Home Page</label>
                     <depends>
                         <field id="paylater_enabled">1</field>
                     </depends>
-                    <field id="paylater_homepage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
+                    <field id="paylater_homepage_display" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="10">
                         <label>Display</label>
                         <config_path>payment/paypal_paylater/homepage_display</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paylater_homepage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
+                    <field id="paylater_homepage_position" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="20">
                         <label>Position</label>
                         <config_path>payment/paypal_paylater/homepage_position</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsHP</source_model>
+                        <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsHP
+                        </source_model>
                         <attribute type="shared">1</attribute>
                         <depends>
                             <field id="paylater_homepage_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_homepage_stylelayout" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
+                    <field id="paylater_homepage_stylelayout" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="30">
                         <label>Style Layout</label>
                         <config_path>payment/paypal_paylater/homepage_stylelayout</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\StyleLayout</source_model>
@@ -370,7 +450,8 @@
                             <field id="paylater_homepage_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_homepage_logotype" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="40">
+                    <field id="paylater_homepage_logotype" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="40">
                         <label>Logo Type</label>
                         <config_path>payment/paypal_paylater/homepage_logotype</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoType</source_model>
@@ -380,7 +461,8 @@
                             <field id="paylater_homepage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_homepage_logoposition" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="50">
+                    <field id="paylater_homepage_logoposition" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="50">
                         <label>Logo Position</label>
                         <config_path>payment/paypal_paylater/homepage_logoposition</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoPosition</source_model>
@@ -391,7 +473,8 @@
                             <field id="paylater_homepage_logotype" separator=",">primary,alternative</field>
                         </depends>
                     </field>
-                    <field id="paylater_homepage_textcolor" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="60">
+                    <field id="paylater_homepage_textcolor" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="60">
                         <label>Text Color</label>
                         <config_path>payment/paypal_paylater/homepage_textcolor</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextColor</source_model>
@@ -401,7 +484,8 @@
                             <field id="paylater_homepage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_homepage_textsize" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="70">
+                    <field id="paylater_homepage_textsize" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="70">
                         <label>Text Size</label>
                         <config_path>payment/paypal_paylater/homepage_textsize</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextSize</source_model>
@@ -411,7 +495,8 @@
                             <field id="paylater_homepage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_homepage_ratio" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="80">
+                    <field id="paylater_homepage_ratio" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="80">
                         <label>Ratio</label>
                         <config_path>payment/paypal_paylater/homepage_ratio</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Ratio</source_model>
@@ -421,7 +506,8 @@
                             <field id="paylater_homepage_stylelayout">flex</field>
                         </depends>
                     </field>
-                    <field id="paylater_homepage_color" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="90">
+                    <field id="paylater_homepage_color" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="90">
                         <label>Color</label>
                         <config_path>payment/paypal_paylater/homepage_color</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Color</source_model>
@@ -432,27 +518,32 @@
                         </depends>
                     </field>
                 </group>
-                <group id="settings_paylater_productpage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
+                <group id="settings_paylater_productpage" translate="label" showInDefault="1" showInWebsite="1"
+                       showInStore="1" sortOrder="30">
                     <label>Catalog Product Page</label>
                     <depends>
                         <field id="paylater_enabled">1</field>
                     </depends>
-                    <field id="paylater_productpage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
+                    <field id="paylater_productpage_display" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="10">
                         <label>Display</label>
                         <config_path>payment/paypal_paylater/productpage_display</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paylater_productpage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
+                    <field id="paylater_productpage_position" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="20">
                         <label>Position</label>
                         <config_path>payment/paypal_paylater/productpage_position</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsCPP</source_model>
+                        <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsCPP
+                        </source_model>
                         <attribute type="shared">1</attribute>
                         <depends>
                             <field id="paylater_productpage_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_productpage_stylelayout" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
+                    <field id="paylater_productpage_stylelayout" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="30">
                         <label>Style Layout</label>
                         <config_path>payment/paypal_paylater/productpage_stylelayout</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\StyleLayout</source_model>
@@ -461,7 +552,8 @@
                             <field id="paylater_productpage_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_productpage_logotype" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="40">
+                    <field id="paylater_productpage_logotype" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="40">
                         <label>Logo Type</label>
                         <config_path>payment/paypal_paylater/productpage_logotype</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoType</source_model>
@@ -471,7 +563,8 @@
                             <field id="paylater_productpage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_productpage_logoposition" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="50">
+                    <field id="paylater_productpage_logoposition" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="50">
                         <label>Logo Position</label>
                         <config_path>payment/paypal_paylater/productpage_logoposition</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoPosition</source_model>
@@ -482,7 +575,8 @@
                             <field id="paylater_productpage_logotype" separator=",">primary,alternative</field>
                         </depends>
                     </field>
-                    <field id="paylater_productpage_textcolor" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="60">
+                    <field id="paylater_productpage_textcolor" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="60">
                         <label>Text Color</label>
                         <config_path>payment/paypal_paylater/productpage_textcolor</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextColor</source_model>
@@ -492,7 +586,8 @@
                             <field id="paylater_productpage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_productpage_textsize" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="70">
+                    <field id="paylater_productpage_textsize" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="70">
                         <label>Text Size</label>
                         <config_path>payment/paypal_paylater/productpage_textsize</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextSize</source_model>
@@ -502,7 +597,8 @@
                             <field id="paylater_productpage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_productpage_ratio" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="80">
+                    <field id="paylater_productpage_ratio" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="80">
                         <label>Ratio</label>
                         <config_path>payment/paypal_paylater/productpage_ratio</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Ratio</source_model>
@@ -512,7 +608,8 @@
                             <field id="paylater_productpage_stylelayout">flex</field>
                         </depends>
                     </field>
-                    <field id="paylater_productpage_color" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="90">
+                    <field id="paylater_productpage_color" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="90">
                         <label>Color</label>
                         <config_path>payment/paypal_paylater/productpage_color</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Color</source_model>
@@ -523,27 +620,32 @@
                         </depends>
                     </field>
                 </group>
-                <group id="settings_paylater_cartpage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
+                <group id="settings_paylater_cartpage" translate="label" showInDefault="1" showInWebsite="1"
+                       showInStore="1" sortOrder="40">
                     <label>Checkout Cart Page</label>
                     <depends>
                         <field id="paylater_enabled">1</field>
                     </depends>
-                    <field id="paylater_cartpage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
+                    <field id="paylater_cartpage_display" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="10">
                         <label>Display</label>
                         <config_path>payment/paypal_paylater/cartpage_display</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paylater_cartpage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
+                    <field id="paylater_cartpage_position" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="20">
                         <label>Position</label>
                         <config_path>payment/paypal_paylater/cartpage_position</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsCart</source_model>
+                        <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsCart
+                        </source_model>
                         <attribute type="shared">1</attribute>
                         <depends>
                             <field id="paylater_cartpage_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_cartpage_stylelayout" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
+                    <field id="paylater_cartpage_stylelayout" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="30">
                         <label>Style Layout</label>
                         <config_path>payment/paypal_paylater/cartpage_stylelayout</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\StyleLayout</source_model>
@@ -552,7 +654,8 @@
                             <field id="paylater_cartpage_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_cartpage_logotype" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="40">
+                    <field id="paylater_cartpage_logotype" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="40">
                         <label>Logo Type</label>
                         <config_path>payment/paypal_paylater/cartpage_logotype</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoType</source_model>
@@ -562,7 +665,8 @@
                             <field id="paylater_cartpage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_cartpage_logoposition" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="50">
+                    <field id="paylater_cartpage_logoposition" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="50">
                         <label>Logo Position</label>
                         <config_path>payment/paypal_paylater/cartpage_logoposition</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoPosition</source_model>
@@ -573,7 +677,8 @@
                             <field id="paylater_cartpage_logotype" separator=",">primary,alternative</field>
                         </depends>
                     </field>
-                    <field id="paylater_cartpage_textcolor" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="60">
+                    <field id="paylater_cartpage_textcolor" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="60">
                         <label>Text Color</label>
                         <config_path>payment/paypal_paylater/cartpage_textcolor</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextColor</source_model>
@@ -583,7 +688,8 @@
                             <field id="paylater_cartpage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_cartpage_textsize" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="70">
+                    <field id="paylater_cartpage_textsize" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="70">
                         <label>Text Size</label>
                         <config_path>payment/paypal_paylater/cartpage_textsize</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextSize</source_model>
@@ -593,7 +699,8 @@
                             <field id="paylater_cartpage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_cartpage_ratio" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="80">
+                    <field id="paylater_cartpage_ratio" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="80">
                         <label>Ratio</label>
                         <config_path>payment/paypal_paylater/cartpage_ratio</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Ratio</source_model>
@@ -603,7 +710,8 @@
                             <field id="paylater_cartpage_stylelayout">flex</field>
                         </depends>
                     </field>
-                    <field id="paylater_cartpage_color" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="90">
+                    <field id="paylater_cartpage_color" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="90">
                         <label>Color</label>
                         <config_path>payment/paypal_paylater/cartpage_color</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Color</source_model>
@@ -614,27 +722,33 @@
                         </depends>
                     </field>
                 </group>
-                <group id="settings_paylater_checkout_payment" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
+                <group id="settings_paylater_checkout_payment" translate="label" showInDefault="1" showInWebsite="1"
+                       showInStore="1" sortOrder="50">
                     <label>Checkout Payment Step</label>
                     <depends>
                         <field id="paylater_enabled">1</field>
                     </depends>
-                    <field id="paylater_checkout_payment_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
+                    <field id="paylater_checkout_payment_display" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="10">
                         <label>Display</label>
                         <config_path>payment/paypal_paylater/checkout_payment_display</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paylater_checkout_payment_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
+                    <field id="paylater_checkout_payment_position" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="20">
                         <label>Position</label>
                         <config_path>payment/paypal_paylater/checkout_payment_position</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsCheckout</source_model>
+                        <source_model>
+                            Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsCheckout
+                        </source_model>
                         <attribute type="shared">1</attribute>
                         <depends>
                             <field id="paylater_checkout_payment_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_checkout_payment_stylelayout" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
+                    <field id="paylater_checkout_payment_stylelayout" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="30">
                         <label>Style Layout</label>
                         <config_path>payment/paypal_paylater/checkout_payment_stylelayout</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\StyleLayout</source_model>
@@ -643,7 +757,8 @@
                             <field id="paylater_checkout_payment_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_checkout_payment_logotype" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="40">
+                    <field id="paylater_checkout_payment_logotype" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="40">
                         <label>Logo Type</label>
                         <config_path>payment/paypal_paylater/checkout_payment_logotype</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoType</source_model>
@@ -653,7 +768,8 @@
                             <field id="paylater_checkout_payment_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_checkout_payment_logoposition" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="50">
+                    <field id="paylater_checkout_payment_logoposition" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="50">
                         <label>Logo Position</label>
                         <config_path>payment/paypal_paylater/checkout_payment_logoposition</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoPosition</source_model>
@@ -664,7 +780,8 @@
                             <field id="paylater_checkout_payment_logotype" separator=",">primary,alternative</field>
                         </depends>
                     </field>
-                    <field id="paylater_checkout_payment_textcolor" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="60">
+                    <field id="paylater_checkout_payment_textcolor" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="60">
                         <label>Text Color</label>
                         <config_path>payment/paypal_paylater/checkout_payment_textcolor</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextColor</source_model>
@@ -674,7 +791,8 @@
                             <field id="paylater_checkout_payment_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_checkout_payment_textsize" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="70">
+                    <field id="paylater_checkout_payment_textsize" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="70">
                         <label>Text Size</label>
                         <config_path>payment/paypal_paylater/checkout_payment_textsize</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextSize</source_model>
@@ -684,7 +802,8 @@
                             <field id="paylater_checkout_payment_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_checkout_payment_ratio" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="80">
+                    <field id="paylater_checkout_payment_ratio" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="80">
                         <label>Ratio</label>
                         <config_path>payment/paypal_paylater/checkout_payment_ratio</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Ratio</source_model>
@@ -694,7 +813,8 @@
                             <field id="paylater_checkout_payment_stylelayout">flex</field>
                         </depends>
                     </field>
-                    <field id="paylater_checkout_payment_color" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="90">
+                    <field id="paylater_checkout_payment_color" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="90">
                         <label>Color</label>
                         <config_path>payment/paypal_paylater/checkout_payment_color</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Color</source_model>
@@ -705,27 +825,33 @@
                         </depends>
                     </field>
                 </group>
-                <group id="settings_paylater_categorypage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
+                <group id="settings_paylater_categorypage" translate="label" showInDefault="1" showInWebsite="1"
+                       showInStore="1" sortOrder="60">
                     <label>Catalog Category Page</label>
                     <depends>
                         <field id="paylater_enabled">1</field>
                     </depends>
-                    <field id="paylater_categorypage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
+                    <field id="paylater_categorypage_display" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="10">
                         <label>Display</label>
                         <config_path>payment/paypal_paylater/categorypage_display</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paylater_categorypage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
+                    <field id="paylater_categorypage_position" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="20">
                         <label>Position</label>
                         <config_path>payment/paypal_paylater/categorypage_position</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsCategoryPage</source_model>
+                        <source_model>
+                            Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsCategoryPage
+                        </source_model>
                         <attribute type="shared">1</attribute>
                         <depends>
                             <field id="paylater_categorypage_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_categorypage_stylelayout" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
+                    <field id="paylater_categorypage_stylelayout" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="30">
                         <label>Style Layout</label>
                         <config_path>payment/paypal_paylater/categorypage_stylelayout</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\StyleLayout</source_model>
@@ -734,7 +860,8 @@
                             <field id="paylater_categorypage_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_categorypage_logotype" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="40">
+                    <field id="paylater_categorypage_logotype" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="40">
                         <label>Logo Type</label>
                         <config_path>payment/paypal_paylater/categorypage_logotype</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoType</source_model>
@@ -744,7 +871,8 @@
                             <field id="paylater_categorypage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_categorypage_logoposition" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="50">
+                    <field id="paylater_categorypage_logoposition" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="50">
                         <label>Logo Position</label>
                         <config_path>payment/paypal_paylater/categorypage_logoposition</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoPosition</source_model>
@@ -755,7 +883,8 @@
                             <field id="paylater_categorypage_logotype" separator=",">primary,alternative</field>
                         </depends>
                     </field>
-                    <field id="paylater_categorypage_textcolor" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="60">
+                    <field id="paylater_categorypage_textcolor" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="60">
                         <label>Text Color</label>
                         <config_path>payment/paypal_paylater/categorypage_textcolor</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextColor</source_model>
@@ -765,7 +894,8 @@
                             <field id="paylater_categorypage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_categorypage_textsize" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="70">
+                    <field id="paylater_categorypage_textsize" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="70">
                         <label>Text Size</label>
                         <config_path>payment/paypal_paylater/categorypage_textsize</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextSize</source_model>
@@ -775,7 +905,8 @@
                             <field id="paylater_categorypage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_categorypage_ratio" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="80">
+                    <field id="paylater_categorypage_ratio" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="80">
                         <label>Ratio</label>
                         <config_path>payment/paypal_paylater/categorypage_ratio</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Ratio</source_model>
@@ -785,7 +916,8 @@
                             <field id="paylater_categorypage_stylelayout">flex</field>
                         </depends>
                     </field>
-                    <field id="paylater_categorypage_color" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="90">
+                    <field id="paylater_categorypage_color" translate="label" type="select" showInDefault="1"
+                           showInWebsite="1" sortOrder="90">
                         <label>Color</label>
                         <config_path>payment/paypal_paylater/categorypage_color</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Color</source_model>
@@ -801,33 +933,40 @@
         <group id="settings_ec" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
             <label>Basic Settings - PayPal Express Checkout</label>
             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-            <field id="title" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+            <field id="title" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1"
+                   showInStore="1">
                 <label>Title</label>
                 <comment>It is recommended to set this value to "PayPal" per store views.</comment>
                 <config_path>payment/paypal_express/title</config_path>
                 <attribute type="shared">1</attribute>
             </field>
-            <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1"
+                   showInStore="1">
                 <label>Sort Order</label>
                 <config_path>payment/paypal_express/sort_order</config_path>
                 <frontend_class>validate-number</frontend_class>
                 <attribute type="shared">1</attribute>
             </field>
-            <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
+            <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1"
+                   showInWebsite="1">
                 <label>Payment Action</label>
                 <config_path>payment/paypal_express/payment_action</config_path>
                 <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions\Express</source_model>
                 <attribute type="shared">1</attribute>
             </field>
-            <field id="visible_on_product" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+            <field id="visible_on_product" translate="label" type="select" sortOrder="40" showInDefault="1"
+                   showInWebsite="1" showInStore="1">
                 <label>Display on Product Details Page</label>
                 <config_path>payment/paypal_express/visible_on_product</config_path>
                 <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 <attribute type="shared">1</attribute>
             </field>
-            <field id="authorization_honor_period" translate="label comment" type="text" sortOrder="50" showInDefault="1" showInWebsite="1">
+            <field id="authorization_honor_period" translate="label comment" type="text" sortOrder="50"
+                   showInDefault="1" showInWebsite="1">
                 <label>Authorization Honor Period (days)</label>
-                <comment>Specifies what the Authorization Honor Period is on the merchant&#8217;s PayPal account. It must mirror the setting in PayPal.</comment>
+                <comment>Specifies what the Authorization Honor Period is on the merchant&#8217;s PayPal account. It
+                    must mirror the setting in PayPal.
+                </comment>
                 <config_path>payment/paypal_express/authorization_honor_period</config_path>
                 <attribute type="shared">1</attribute>
                 <depends>
@@ -835,9 +974,12 @@
                 </depends>
                 <validate>validate-zero-or-greater validate-digits</validate>
             </field>
-            <field id="order_valid_period" translate="label comment" type="text" sortOrder="60" showInDefault="1" showInWebsite="1">
+            <field id="order_valid_period" translate="label comment" type="text" sortOrder="60" showInDefault="1"
+                   showInWebsite="1">
                 <label>Order Valid Period (days)</label>
-                <comment>Specifies what the Order Valid Period is on the merchant&#x2019;s PayPal account. It must mirror the setting in PayPal.</comment>
+                <comment>Specifies what the Order Valid Period is on the merchant&#x2019;s PayPal account. It must
+                    mirror the setting in PayPal.
+                </comment>
                 <config_path>payment/paypal_express/order_valid_period</config_path>
                 <attribute type="shared">1</attribute>
                 <depends>
@@ -845,32 +987,39 @@
                 </depends>
                 <validate>validate-zero-or-greater validate-digits</validate>
             </field>
-            <field id="child_authorization_number" translate="label comment" type="text" sortOrder="70" showInDefault="1" showInWebsite="1">
+            <field id="child_authorization_number" translate="label comment" type="text" sortOrder="70"
+                   showInDefault="1" showInWebsite="1">
                 <label>Number of Child Authorizations</label>
-                <comment>The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.</comment>
+                <comment>The default number of child authorizations in your PayPal account is 1. To do multiple
+                    authorizations please contact PayPal to request an increase.
+                </comment>
                 <config_path>payment/paypal_express/child_authorization_number</config_path>
                 <attribute type="shared">1</attribute>
                 <depends>
                     <field id="payment_action">Order</field>
                 </depends>
             </field>
-            <group id="settings_ec_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="80">
+            <group id="settings_ec_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1"
+                   sortOrder="80">
                 <label>Advanced Settings</label>
                 <fieldset_css>config-advanced</fieldset_css>
-                <field id="visible_on_cart" translate="label comment" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="visible_on_cart" translate="label comment" type="select" sortOrder="5" showInDefault="1"
+                       showInWebsite="1" showInStore="1">
                     <label>Display on Shopping Cart</label>
                     <config_path>payment/paypal_express/visible_on_cart</config_path>
                     <comment>Also affects mini-shopping cart.</comment>
                     <source_model>Magento\Paypal\Model\System\Config\Source\Yesnoshortcut</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="allowspecific" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
+                <field id="allowspecific" translate="label" type="select" sortOrder="10" showInDefault="1"
+                       showInWebsite="1">
                     <label>Payment Applicable From</label>
                     <config_path>payment/paypal_express/allowspecific</config_path>
                     <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="specificcountry" translate="label" type="multiselect" sortOrder="20" showInDefault="1" showInWebsite="1">
+                <field id="specificcountry" translate="label" type="multiselect" sortOrder="20" showInDefault="1"
+                       showInWebsite="1">
                     <label>Countries Payment Applicable From</label>
                     <config_path>payment/paypal_express/specificcountry</config_path>
                     <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
@@ -885,52 +1034,67 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1">
+                <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1"
+                       showInWebsite="1">
                     <label>Enable SSL verification</label>
                     <config_path>payment/paypal_express/verify_peer</config_path>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="line_items_enabled" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
+                <field id="line_items_enabled" translate="label" type="select" sortOrder="40" showInDefault="1"
+                       showInWebsite="1">
                     <label>Transfer Cart Line Items</label>
                     <config_path>payment/paypal_express/line_items_enabled</config_path>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="transfer_shipping_options" translate="label tooltip comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
+                <field id="transfer_shipping_options" translate="label tooltip comment" type="select" sortOrder="50"
+                       showInDefault="1" showInWebsite="1">
                     <label>Transfer Shipping Options</label>
                     <config_path>payment/paypal_express/transfer_shipping_options</config_path>
-                    <tooltip>If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.</tooltip>
-                    <comment>Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.</comment>
+                    <tooltip>If this option is enabled, customer can change shipping address and shipping method on
+                        PayPal website. In live mode works via HTTPS protocol only.
+                    </tooltip>
+                    <comment>Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer
+                        only first 10 cheapest shipping options if there are more than 10 available.
+                    </comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                     <depends>
                         <field id="line_items_enabled">1</field>
                     </depends>
                 </field>
-                <field id="button_flavor" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="button_flavor" translate="label" type="select" sortOrder="60" showInDefault="1"
+                       showInWebsite="1" showInStore="1">
                     <label>Shortcut Buttons Flavor</label>
                     <config_path>paypal/wpp/button_flavor</config_path>
                     <source_model>Magento\Paypal\Model\Config::getExpressCheckoutButtonFlavors</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="solution_type" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
+                <field id="solution_type" translate="label comment" type="select" sortOrder="70" showInDefault="1"
+                       showInWebsite="1">
                     <label>Enable PayPal Guest Checkout</label>
                     <comment>Ability for buyer to purchase without PayPal account.</comment>
                     <config_path>payment/paypal_express/solution_type</config_path>
                     <source_model>Magento\Paypal\Model\Config::getExpressCheckoutSolutionTypes</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="require_billing_address" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
+                <field id="require_billing_address" translate="label comment" type="select" sortOrder="80"
+                       showInDefault="1" showInWebsite="1">
                     <label>Require Customer's Billing Address</label>
-                    <comment>This feature needs be enabled first for the merchant account through PayPal technical support.</comment>
+                    <comment>This feature needs be enabled first for the merchant account through PayPal technical
+                        support.
+                    </comment>
                     <config_path>payment/paypal_express/require_billing_address</config_path>
                     <source_model>Magento\Paypal\Model\System\Config\Source\RequireBillingAddress</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="allow_ba_signup" translate="label comment tooltip" type="select" sortOrder="90" showInDefault="1" showInWebsite="1">
+                <field id="allow_ba_signup" translate="label comment tooltip" type="select" sortOrder="90"
+                       showInDefault="1" showInWebsite="1">
                     <label>Billing Agreement Signup</label>
-                    <comment>Whether to create a billing agreement, if there are no active billing agreements available.</comment>
+                    <comment>Whether to create a billing agreement, if there are no active billing agreements
+                        available.
+                    </comment>
                     <tooltip>
                         <![CDATA[Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.]]>
                     </tooltip>
@@ -938,15 +1102,18 @@
                     <source_model>Magento\Paypal\Model\Config::getExpressCheckoutBASignupOptions</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="skip_order_review_step" translate="label" type="select" sortOrder="95" showInDefault="1" showInWebsite="1">
+                <field id="skip_order_review_step" translate="label" type="select" sortOrder="95" showInDefault="1"
+                       showInWebsite="1">
                     <label>Skip Order Review Step</label>
                     <config_path>payment/paypal_express/skip_order_review_step</config_path>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <group id="express_checkout_billing_agreement" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
+                <group id="express_checkout_billing_agreement" translate="label" showInDefault="1" showInWebsite="1"
+                       showInStore="1" sortOrder="100">
                     <label>PayPal Billing Agreement Settings</label>
-                    <field id="active" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
+                    <field id="active" translate="label comment" type="select" sortOrder="10" showInDefault="1"
+                           showInWebsite="1">
                         <label>Enabled</label>
                         <comment>
                             <![CDATA[Will appear as a payment option only for customers who have at least one active billing agreement.]]>
@@ -955,30 +1122,35 @@
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1"
+                           showInStore="1">
                         <label>Title</label>
                         <config_path>payment/paypal_billing_agreement/title</config_path>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1"
+                           showInWebsite="1" showInStore="1">
                         <label>Sort Order</label>
                         <config_path>payment/paypal_billing_agreement/sort_order</config_path>
                         <frontend_class>validate-number</frontend_class>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="payment_action" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
+                    <field id="payment_action" translate="label" type="select" sortOrder="40" showInDefault="1"
+                           showInWebsite="1">
                         <label>Payment Action</label>
                         <config_path>payment/paypal_billing_agreement/payment_action</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="allowspecific" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
+                    <field id="allowspecific" translate="label" type="select" sortOrder="50" showInDefault="1"
+                           showInWebsite="1">
                         <label>Payment Applicable From</label>
                         <config_path>payment/paypal_billing_agreement/allowspecific</config_path>
                         <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="specificcountry" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1">
+                    <field id="specificcountry" translate="label" type="multiselect" sortOrder="60" showInDefault="1"
+                           showInWebsite="1">
                         <label>Countries Payment Applicable From</label>
                         <config_path>payment/paypal_billing_agreement/specificcountry</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
@@ -987,57 +1159,66 @@
                             <field id="allowspecific">1</field>
                         </depends>
                     </field>
-                    <field id="debug" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
+                    <field id="debug" translate="label" type="select" sortOrder="70" showInDefault="1"
+                           showInWebsite="1">
                         <label>Debug Mode</label>
                         <config_path>payment/paypal_billing_agreement/debug</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="verify_peer" translate="label" type="select" sortOrder="75" showInDefault="1" showInWebsite="1">
+                    <field id="verify_peer" translate="label" type="select" sortOrder="75" showInDefault="1"
+                           showInWebsite="1">
                         <label>Enable SSL verification</label>
                         <config_path>payment/paypal_billing_agreement/verify_peer</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="line_items_enabled" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
+                    <field id="line_items_enabled" translate="label" type="select" sortOrder="80" showInDefault="1"
+                           showInWebsite="1">
                         <label>Transfer Cart Line Items</label>
                         <config_path>payment/paypal_billing_agreement/line_items_enabled</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="allow_billing_agreement_wizard" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1">
+                    <field id="allow_billing_agreement_wizard" translate="label" type="select" sortOrder="90"
+                           showInDefault="1" showInWebsite="1">
                         <label>Allow in Billing Agreement Wizard</label>
                         <config_path>payment/paypal_billing_agreement/allow_billing_agreement_wizard</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
                 </group>
-                <group id="express_checkout_settlement_report" translate="label" showInDefault="1" showInWebsite="1" sortOrder="110">
+                <group id="express_checkout_settlement_report" translate="label" showInDefault="1" showInWebsite="1"
+                       sortOrder="110">
                     <label>Settlement Report Settings</label>
                     <field id="heading_sftp" translate="label" sortOrder="10" showInDefault="1" showInWebsite="1">
                         <label>SFTP Credentials</label>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="settlement_reports_ftp_login" translate="label" type="obscure" sortOrder="20" showInDefault="1" showInWebsite="1">
+                    <field id="settlement_reports_ftp_login" translate="label" type="obscure" sortOrder="20"
+                           showInDefault="1" showInWebsite="1">
                         <label>Login</label>
                         <config_path>paypal/fetch_reports/ftp_login</config_path>
                         <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="settlement_reports_ftp_password" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
+                    <field id="settlement_reports_ftp_password" translate="label" type="obscure" sortOrder="30"
+                           showInDefault="1" showInWebsite="1">
                         <label>Password</label>
                         <config_path>paypal/fetch_reports/ftp_password</config_path>
                         <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="settlement_reports_ftp_sandbox" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
+                    <field id="settlement_reports_ftp_sandbox" translate="label" type="select" sortOrder="40"
+                           showInDefault="1" showInWebsite="1">
                         <label>Sandbox Mode</label>
                         <config_path>paypal/fetch_reports/ftp_sandbox</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="settlement_reports_ftp_ip" translate="label comment tooltip" type="text" sortOrder="50" showInDefault="1" showInWebsite="1">
+                    <field id="settlement_reports_ftp_ip" translate="label comment tooltip" type="text" sortOrder="50"
+                           showInDefault="1" showInWebsite="1">
                         <label>Custom Endpoint Hostname or IP-Address</label>
                         <comment>By default it is "reports.paypal.com".</comment>
                         <tooltip>Use colon to specify port. For example: "test.example.com:5224".</tooltip>
@@ -1047,7 +1228,8 @@
                             <field id="settlement_reports_ftp_sandbox">0</field>
                         </depends>
                     </field>
-                    <field id="settlement_reports_ftp_path" translate="label comeent" type="text" sortOrder="60" showInDefault="1" showInWebsite="1">
+                    <field id="settlement_reports_ftp_path" translate="label comeent" type="text" sortOrder="60"
+                           showInDefault="1" showInWebsite="1">
                         <label>Custom Path</label>
                         <comment>By default it is "/ppreports/outgoing".</comment>
                         <config_path>paypal/fetch_reports/ftp_path</config_path>
@@ -1061,13 +1243,15 @@
                         <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="settlement_reports_active" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
+                    <field id="settlement_reports_active" translate="label" type="select" sortOrder="80"
+                           showInDefault="1" showInWebsite="1">
                         <label>Enable Automatic Fetching</label>
                         <config_path>paypal/fetch_reports/active</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="settlement_reports_schedule" translate="label comment" type="select" sortOrder="90" showInDefault="1">
+                    <field id="settlement_reports_schedule" translate="label comment" type="select" sortOrder="90"
+                           showInDefault="1">
                         <label>Schedule</label>
                         <comment>PayPal retains reports for 45 days.</comment>
                         <config_path>paypal/fetch_reports/schedule</config_path>
@@ -1080,21 +1264,25 @@
                         <attribute type="shared">1</attribute>
                     </field>
                 </group>
-                <group id="express_checkout_frontend" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="120">
+                <group id="express_checkout_frontend" translate="label" showInDefault="1" showInWebsite="1"
+                       showInStore="1" sortOrder="120">
                     <label>Frontend Experience Settings</label>
-                    <field id="logo" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="logo" translate="label comment" type="select" sortOrder="10" showInDefault="1"
+                           showInWebsite="1" showInStore="1">
                         <label>PayPal Product Logo</label>
                         <comment>Displays on catalog pages and homepage.</comment>
                         <config_path>paypal/style/logo</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\Logo</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paypal_pages" translate="label" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="paypal_pages" translate="label" sortOrder="20" showInDefault="1" showInWebsite="1"
+                           showInStore="1">
                         <label>PayPal Merchant Pages Style</label>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="page_style" translate="label tooltip" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="page_style" translate="label tooltip" type="text" sortOrder="30" showInDefault="1"
+                           showInWebsite="1" showInStore="1">
                         <label>Page Style</label>
                         <config_path>paypal/style/page_style</config_path>
                         <tooltip>
@@ -1102,7 +1290,8 @@
                         </tooltip>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paypal_hdrimg" translate="label tooltip" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="paypal_hdrimg" translate="label tooltip" sortOrder="40" showInDefault="1"
+                           showInWebsite="1" showInStore="1">
                         <label>Header Image URL</label>
                         <config_path>paypal/style/paypal_hdrimg</config_path>
                         <tooltip>
@@ -1110,7 +1299,8 @@
                         </tooltip>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paypal_hdrbackcolor" translate="label tooltip" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="paypal_hdrbackcolor" translate="label tooltip" sortOrder="50" showInDefault="1"
+                           showInWebsite="1" showInStore="1">
                         <label>Header Background Color</label>
                         <config_path>paypal/style/paypal_hdrbackcolor</config_path>
                         <tooltip>
@@ -1118,13 +1308,15 @@
                         </tooltip>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paypal_hdrbordercolor" translate="label tooltip" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="paypal_hdrbordercolor" translate="label tooltip" sortOrder="60" showInDefault="1"
+                           showInWebsite="1" showInStore="1">
                         <label>Header Border Color</label>
                         <config_path>paypal/style/paypal_hdrbordercolor</config_path>
                         <tooltip>2-pixel perimeter around the header space.</tooltip>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paypal_payflowcolor" translate="label tooltip" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="paypal_payflowcolor" translate="label tooltip" sortOrder="70" showInDefault="1"
+                           showInWebsite="1" showInStore="1">
                         <label>Page Background Color</label>
                         <config_path>paypal/style/paypal_payflowcolor</config_path>
                         <tooltip>
@@ -1132,73 +1324,93 @@
                         </tooltip>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="checkout_display" translate="label" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="checkout_display" translate="label" sortOrder="80" showInDefault="1" showInWebsite="1"
+                           showInStore="1">
                         <label>Customize Smart Buttons</label>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <group id="checkout_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
+                    <group id="checkout_page_button" translate="label" showInDefault="1" showInWebsite="1"
+                           showInStore="1" sortOrder="90">
                         <label>Checkout Page</label>
-                        <field id="checkout_page_button_customize" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
+                        <field id="checkout_page_button_customize" translate="label" type="select" showInDefault="1"
+                               showInWebsite="1" showInStore="1" sortOrder="10">
                             <label>Customize Button</label>
                             <config_path>paypal/style/checkout_page_button_customize</config_path>
                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                             <attribute type="shared">1</attribute>
                         </field>
-                        <field id="checkout_page_button_label" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+                        <field id="checkout_page_button_label" translate="label comment" type="select" showInDefault="1"
+                               showInWebsite="1" showInStore="1" sortOrder="20">
                             <label>Label</label>
-                            <comment><![CDATA[The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.]]></comment>
+                            <comment>
+                                <![CDATA[The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.]]></comment>
                             <config_path>paypal/style/checkout_page_button_label</config_path>
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\ButtonStylesLabel</frontend_model>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLabel</source_model>
+                            <frontend_model>
+                                Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\ButtonStylesLabel
+                            </frontend_model>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLabel
+                            </source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>
-                        <field id="checkout_page_button_mx_installment_period" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+                        <field id="checkout_page_button_mx_installment_period" translate="label" type="select"
+                               showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
                             <label>Mexico Installment Period</label>
                             <config_path>paypal/style/checkout_page_button_mx_installment_period</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getMxInstallmentPeriod</source_model>
+                            <source_model>
+                                Magento\Paypal\Model\System\Config\Source\ButtonStyles::getMxInstallmentPeriod
+                            </source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                                 <field id="checkout_page_button_label">installment</field>
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>
-                        <field id="checkout_page_button_br_installment_period" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+                        <field id="checkout_page_button_br_installment_period" translate="label" type="select"
+                               showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
                             <label>Brazil Installment Period</label>
                             <config_path>paypal/style/checkout_page_button_br_installment_period</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getBrInstallmentPeriod</source_model>
+                            <source_model>
+                                Magento\Paypal\Model\System\Config\Source\ButtonStyles::getBrInstallmentPeriod
+                            </source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                                 <field id="checkout_page_button_label">installment</field>
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>
-                        <field id="checkout_page_button_layout" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
+                        <field id="checkout_page_button_layout" translate="label" type="select" showInDefault="1"
+                               showInWebsite="1" showInStore="1" sortOrder="30">
                             <label>Layout</label>
                             <config_path>paypal/style/checkout_page_button_layout</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLayout</source_model>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLayout
+                            </source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                                 <field id="checkout_page_button_label" negative="1">credit</field>
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>
-                        <field id="checkout_page_button_shape" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
+                        <field id="checkout_page_button_shape" translate="label" type="select" showInDefault="1"
+                               showInWebsite="1" showInStore="1" sortOrder="50">
                             <label>Shape</label>
                             <config_path>paypal/style/checkout_page_button_shape</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getShape</source_model>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getShape
+                            </source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>
-                        <field id="checkout_page_button_color" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
+                        <field id="checkout_page_button_color" translate="label" type="select" showInDefault="1"
+                               showInWebsite="1" showInStore="1" sortOrder="60">
                             <label>Color</label>
                             <config_path>paypal/style/checkout_page_button_color</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getColor</source_model>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getColor
+                            </source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                                 <field id="checkout_page_button_label" negative="1">credit</field>
@@ -1206,45 +1418,53 @@
                             <attribute type="shared">1</attribute>
                         </field>
                     </group>
-                    <group id="product_page_button" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
+                    <group id="product_page_button" translate="label comment" showInDefault="1" showInWebsite="1"
+                           showInStore="1" sortOrder="100">
                         <label>Product Pages</label>
-                        <field id="product_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
+                        <field id="product_page_button_customize"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
                             <config_path>paypal/style/product_page_button_customize</config_path>
                         </field>
-                        <field id="product_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
+                        <field id="product_page_button_label"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
                             <config_path>paypal/style/product_page_button_label</config_path>
                             <depends>
                                 <field id="product_page_button_customize">1</field>
                             </depends>
                         </field>
-                        <field id="product_page_button_mx_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
+                        <field id="product_page_button_mx_installment_period"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
                             <config_path>paypal/style/product_page_button_mx_installment_period</config_path>
                             <depends>
                                 <field id="product_page_button_customize">1</field>
                                 <field id="product_page_button_label">installment</field>
                             </depends>
                         </field>
-                        <field id="product_page_button_br_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
+                        <field id="product_page_button_br_installment_period"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
                             <config_path>paypal/style/product_page_button_br_installment_period</config_path>
                             <depends>
                                 <field id="product_page_button_customize">1</field>
                                 <field id="product_page_button_label">installment</field>
                             </depends>
                         </field>
-                        <field id="product_page_button_layout" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
+                        <field id="product_page_button_layout"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
                             <config_path>paypal/style/product_page_button_layout</config_path>
                             <depends>
                                 <field id="product_page_button_customize">1</field>
                                 <field id="product_page_button_label" negative="1">credit</field>
                             </depends>
                         </field>
-                        <field id="product_page_button_shape" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
+                        <field id="product_page_button_shape"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
                             <config_path>paypal/style/product_page_button_shape</config_path>
                             <depends>
                                 <field id="product_page_button_customize">1</field>
                             </depends>
                         </field>
-                        <field id="product_page_button_color" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
+                        <field id="product_page_button_color"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
                             <config_path>paypal/style/product_page_button_color</config_path>
                             <depends>
                                 <field id="product_page_button_customize">1</field>
@@ -1252,45 +1472,53 @@
                             </depends>
                         </field>
                     </group>
-                    <group id="cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="110">
+                    <group id="cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1"
+                           sortOrder="110">
                         <label>Cart Page</label>
-                        <field id="cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
+                        <field id="cart_page_button_customize"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
                             <config_path>paypal/style/cart_page_button_customize</config_path>
                         </field>
-                        <field id="cart_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
+                        <field id="cart_page_button_label"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
                             <config_path>paypal/style/cart_page_button_label</config_path>
                             <depends>
                                 <field id="cart_page_button_customize">1</field>
                             </depends>
                         </field>
-                        <field id="cart_page_button_mx_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
+                        <field id="cart_page_button_mx_installment_period"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
                             <config_path>paypal/style/cart_page_button_mx_installment_period</config_path>
                             <depends>
                                 <field id="cart_page_button_customize">1</field>
                                 <field id="cart_page_button_label">installment</field>
                             </depends>
                         </field>
-                        <field id="cart_page_button_br_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
+                        <field id="cart_page_button_br_installment_period"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
                             <config_path>paypal/style/cart_page_button_br_installment_period</config_path>
                             <depends>
                                 <field id="cart_page_button_customize">1</field>
                                 <field id="cart_page_button_label">installment</field>
                             </depends>
                         </field>
-                        <field id="cart_page_button_layout" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
+                        <field id="cart_page_button_layout"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
                             <config_path>paypal/style/cart_page_button_layout</config_path>
                             <depends>
                                 <field id="cart_page_button_customize">1</field>
                                 <field id="cart_page_button_label" negative="1">credit</field>
                             </depends>
                         </field>
-                        <field id="cart_page_button_shape" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
+                        <field id="cart_page_button_shape"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
                             <config_path>paypal/style/cart_page_button_shape</config_path>
                             <depends>
                                 <field id="cart_page_button_customize">1</field>
                             </depends>
                         </field>
-                        <field id="cart_page_button_color" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
+                        <field id="cart_page_button_color"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
                             <config_path>paypal/style/cart_page_button_color</config_path>
                             <depends>
                                 <field id="cart_page_button_customize">1</field>
@@ -1298,45 +1526,53 @@
                             </depends>
                         </field>
                     </group>
-                    <group id="mini_cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="120">
+                    <group id="mini_cart_page_button" translate="label" showInDefault="1" showInWebsite="1"
+                           showInStore="1" sortOrder="120">
                         <label>Mini Cart</label>
-                        <field id="mini_cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
+                        <field id="mini_cart_page_button_customize"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
                             <config_path>paypal/style/mini_cart_page_button_customize</config_path>
                         </field>
-                        <field id="mini_cart_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
+                        <field id="mini_cart_page_button_label"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
                             <config_path>paypal/style/mini_cart_page_button_label</config_path>
                             <depends>
                                 <field id="mini_cart_page_button_customize">1</field>
                             </depends>
                         </field>
-                        <field id="mini_cart_page_button_mx_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
+                        <field id="mini_cart_page_button_mx_installment_period"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
                             <config_path>paypal/style/mini_cart_page_button_mx_installment_period</config_path>
                             <depends>
                                 <field id="mini_cart_page_button_customize">1</field>
                                 <field id="mini_cart_page_button_label">installment</field>
                             </depends>
                         </field>
-                        <field id="mini_cart_page_button_br_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
+                        <field id="mini_cart_page_button_br_installment_period"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
                             <config_path>paypal/style/mini_cart_page_button_br_installment_period</config_path>
                             <depends>
                                 <field id="mini_cart_page_button_customize">1</field>
                                 <field id="mini_cart_page_button_label">installment</field>
                             </depends>
                         </field>
-                        <field id="mini_cart_page_button_layout" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
+                        <field id="mini_cart_page_button_layout"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
                             <config_path>paypal/style/mini_cart_page_button_layout</config_path>
                             <depends>
                                 <field id="mini_cart_page_button_customize">1</field>
                                 <field id="mini_cart_page_button_label" negative="1">credit</field>
                             </depends>
                         </field>
-                        <field id="mini_cart_page_button_shape" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
+                        <field id="mini_cart_page_button_shape"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
                             <config_path>paypal/style/mini_cart_page_button_shape</config_path>
                             <depends>
                                 <field id="mini_cart_page_button_customize">1</field>
                             </depends>
                         </field>
-                        <field id="mini_cart_page_button_color" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
+                        <field id="mini_cart_page_button_color"
+                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
                             <config_path>paypal/style/mini_cart_page_button_color</config_path>
                             <depends>
                                 <field id="mini_cart_page_button_customize">1</field>
@@ -1344,9 +1580,11 @@
                             </depends>
                         </field>
                     </group>
-                    <group id="features" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="130">
+                    <group id="features" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1"
+                           sortOrder="130">
                         <label>Features</label>
-                        <field id="disable_funding_options" translate="label comment" type="multiselect" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <field id="disable_funding_options" translate="label comment" type="multiselect" sortOrder="10"
+                               showInDefault="1" showInWebsite="1" showInStore="1">
                             <label>Disable Funding Options</label>
                             <comment>
                                 <![CDATA[PayPal will automatically display each enabled funding option to eligible buyers.
@@ -1354,7 +1592,9 @@
                                 offered and the currency offered by the merchant is USD.]]>
                             </comment>
                             <config_path>paypal/style/disable_funding_options</config_path>
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect\DisabledFundingOptions</frontend_model>
+                            <frontend_model>
+                                Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect\DisabledFundingOptions
+                            </frontend_model>
                             <source_model>Magento\Paypal\Model\System\Config\Source\DisableFundingOptions</source_model>
                             <attribute type="shared">1</attribute>
                             <can_be_empty>1</can_be_empty>

From 720b43eb00fac3badb0d48606a32827a11efc183 Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Wed, 29 Sep 2021 21:52:25 +0530
Subject: [PATCH 22/87] AC-1228::BN code attribute into Paypal JSSDK script

---
 app/code/Magento/Paypal/Model/SmartButtonConfig.php        | 5 ++++-
 .../web/js/in-context/express-checkout-smart-buttons.js    | 2 +-
 .../Paypal/view/frontend/web/js/in-context/paypal-sdk.js   | 7 ++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/SmartButtonConfig.php b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
index 830d51e0221ec..0a06bcda2714d 100644
--- a/app/code/Magento/Paypal/Model/SmartButtonConfig.php
+++ b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
@@ -81,7 +81,10 @@ public function getConfig(string $page): array
             'styles' => $this->getButtonStyles($page),
             'isVisibleOnProductPage'  => (bool)$this->config->getValue('visible_on_product'),
             'isGuestCheckoutAllowed'  => $isGuestCheckoutAllowed,
-            'sdkUrl' => $this->sdkUrl->getUrl()
+            'sdkUrl' => $this->sdkUrl->getUrl(),
+            'dataAttributes' => [
+                'data-partner-attribution-id'   => 'BN_CODE'
+            ]
         ];
     }
 
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index f1c8a6c8cd35c..b76d1e0bf928d 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -64,7 +64,7 @@ define([
     }
 
     return function (clientConfig, element) {
-        paypalSdk(clientConfig.sdkUrl).done(function (paypal) {
+        paypalSdk(clientConfig.sdkUrl, clientConfig.dataAttributes).done(function (paypal) {
             paypal.Buttons({
                 style: clientConfig.styles,
 
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
index bc2928fb623ba..a8bb301b0a859 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
@@ -13,7 +13,7 @@ define([
      * Loads the PayPal SDK object
      * @param {String} paypalUrl - the url of the PayPal SDK
      */
-    return function loadPaypalScript(paypalUrl) {
+    return function loadPaypalScript(paypalUrl, dataAttributes) {
         //configuration for loaded PayPal script
         require.config({
             paths: {
@@ -23,6 +23,11 @@ define([
                 paypalSdk: {
                     exports: 'paypal'
                 }
+            },
+            onNodeCreated: function(node, config, name, url){
+                $.each(dataAttributes, function (index, elem) {
+                    node.setAttribute( index, elem);
+                });
             }
         });
 

From e8c5d8923d66c28e421a539d1cc7f302f9abb7f0 Mon Sep 17 00:00:00 2001
From: glo5363 <glo05363@adobe.com>
Date: Wed, 29 Sep 2021 22:24:10 +0530
Subject: [PATCH 23/87] changes after automation tests

---
 app/code/Magento/Paypal/Model/Config.php               | 7 +++----
 app/code/Magento/Paypal/Model/SdkUrl.php               | 6 +++---
 app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php | 3 +--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 0fe4a1c6be6c1..47fc9e1f2b1a2 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -619,8 +619,7 @@ public function __construct(
         \Magento\Payment\Model\Source\CctypeFactory $cctypeFactory,
         \Magento\Paypal\Model\CertFactory $certFactory,
         $params = []
-    )
-    {
+    ) {
         parent::__construct($scopeConfig);
         $this->directoryHelper = $directoryHelper;
         $this->_storeManager = $storeManager;
@@ -1616,8 +1615,8 @@ protected function _mapWpukFieldset($fieldName)
         if ($this->_methodCode == self::METHOD_WPP_PE_EXPRESS && $this->isMethodAvailable(self::METHOD_PAYFLOWLINK)) {
             $pathPrefix = 'payment/payflow_link';
         } elseif ($this->_methodCode == self::METHOD_WPP_PE_EXPRESS && $this->isMethodAvailable(
-                self::METHOD_PAYFLOWADVANCED
-            )
+            self::METHOD_PAYFLOWADVANCED
+        )
         ) {
             $pathPrefix = 'payment/payflow_advanced';
         } elseif ($this->_methodCode == self::METHOD_WPP_PE_EXPRESS) {
diff --git a/app/code/Magento/Paypal/Model/SdkUrl.php b/app/code/Magento/Paypal/Model/SdkUrl.php
index 59e28eb5fed40..402e43ee0a471 100644
--- a/app/code/Magento/Paypal/Model/SdkUrl.php
+++ b/app/code/Magento/Paypal/Model/SdkUrl.php
@@ -82,8 +82,7 @@ public function __construct(
         StoreManagerInterface $storeManager,
         $disallowedFundingMap = [],
         $unsupportedPaymentMethods = []
-    )
-    {
+    ) {
         $this->localeResolver = $localeResolver;
         $this->config = $configFactory->create();
         $this->config->setMethod(Config::METHOD_EXPRESS);
@@ -174,7 +173,8 @@ private function getClientId()
     }
 
     /**
-     * get Configured value for paypal buyer country
+     * Get Configured value for paypal buyer country
+     *
      * @return string
      */
     private function getBuyerCountry()
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php b/app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php
index b6aec6328acec..73ec49703a0f8 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php
@@ -97,8 +97,7 @@ public function testGetConfig(
         bool $isBuyerCountryEnabled,
         bool $isPaypalGuestCheckoutEnabled,
         array $expected
-    )
-    {
+    ) {
         $this->localeResolverMock->method('getLocale')->willReturn($locale);
         $this->configMock->method('getValue')->willReturnMap(
             [

From 05a72e9cd3c10d9ee190af42c419e0687d9c4c4d Mon Sep 17 00:00:00 2001
From: glo5363 <glo05363@adobe.com>
Date: Thu, 30 Sep 2021 12:43:40 +0530
Subject: [PATCH 24/87] Changes after automation tests

---
 .../Unit/Model/_files/expected_url_config.php |   2 +-
 .../etc/adminhtml/system/express_checkout.xml | 647 ++++++------------
 2 files changed, 209 insertions(+), 440 deletions(-)

diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
index 22d647473acba..ad0d719bc08f6 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
@@ -10,7 +10,7 @@
  * @param array $params
  * @return String
  */
-function generateExpectedPaypalSdkUrl(array $params): string
+function generateExpectedPaypalSdkUrl(array $params) : String
 {
     return 'https://www.paypal.com/sdk/js?' . http_build_query($params);
 }
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 4af5a5e3e6c40..34919360e47d1 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -5,10 +5,8 @@
  * See COPYING.txt for license details.
  */
 -->
-<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="express_checkout" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1"
-           sortOrder="60">
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="express_checkout" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
         <label>Express Checkout</label>
         <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
         <fieldset_css>paypal-other-section</fieldset_css>
@@ -21,12 +19,10 @@
         <group id="express_checkout_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
             <label>Required PayPal Settings</label>
             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-            <group id="express_checkout_required_express_checkout" translate="label" showInDefault="1" showInWebsite="1"
-                   sortOrder="10">
+            <group id="express_checkout_required_express_checkout" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
                 <label>Express Checkout</label>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                <field id="business_account" translate="label comment tooltip" showInDefault="1" showInWebsite="1"
-                       sortOrder="5">
+                <field id="business_account" translate="label comment tooltip" showInDefault="1" showInWebsite="1" sortOrder="5">
                     <label>Email Associated with PayPal Merchant Account (Optional)</label>
                     <frontend_class>not-required</frontend_class>
                     <comment>
@@ -37,29 +33,25 @@
                     <validate>validate-email</validate>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="api_authentication" translate="label" type="select" sortOrder="20" showInDefault="1"
-                       showInWebsite="1">
+                <field id="api_authentication" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
                     <label>API Authentication Methods</label>
                     <config_path>paypal/wpp/api_authentication</config_path>
                     <source_model>Magento\Paypal\Model\Config::getApiAuthenticationMethods</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="api_username" translate="label" type="obscure" sortOrder="30" showInDefault="1"
-                       showInWebsite="1">
+                <field id="api_username" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
                     <label>API Username</label>
                     <config_path>paypal/wpp/api_username</config_path>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="api_password" translate="label" type="obscure" sortOrder="40" showInDefault="1"
-                       showInWebsite="1">
+                <field id="api_password" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1">
                     <label>API Password</label>
                     <config_path>paypal/wpp/api_password</config_path>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="api_signature" translate="label" type="obscure" sortOrder="50" showInDefault="1"
-                       showInWebsite="1">
+                <field id="api_signature" translate="label" type="obscure" sortOrder="50" showInDefault="1" showInWebsite="1">
                     <label>API Signature</label>
                     <config_path>paypal/wpp/api_signature</config_path>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
@@ -77,8 +69,7 @@
                         <field id="api_authentication">1</field>
                     </depends>
                 </field>
-                <field id="api_wizard" translate="button_label attribute sandbox_button_label" sortOrder="70"
-                       showInDefault="1" showInWebsite="1">
+                <field id="api_wizard" translate="button_label attribute sandbox_button_label" sortOrder="70" showInDefault="1" showInWebsite="1">
 
                     <attribute type="button_label">Get Credentials from PayPal</attribute>
                     <attribute type="button_url">
@@ -106,15 +97,13 @@
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\ApiWizard</frontend_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="sandbox_flag" translate="label" type="select" sortOrder="80" showInDefault="1"
-                       showInWebsite="1">
+                <field id="sandbox_flag" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
                     <label>Sandbox Mode</label>
                     <config_path>paypal/wpp/sandbox_flag</config_path>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="buyer_country" translate="label" type="select" sortOrder="85" showInDefault="1"
-                       showInWebsite="1">
+                <field id="buyer_country" translate="label" type="select" sortOrder="85" showInDefault="1" showInWebsite="1">
                     <label>Buyer Country</label>
                     <config_path>payment/paypal_express/buyer_country</config_path>
                     <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
@@ -123,15 +112,13 @@
                         <field id="sandbox_flag">1</field>
                     </depends>
                 </field>
-                <field id="use_proxy" translate="label" type="select" sortOrder="90" showInDefault="1"
-                       showInWebsite="1">
+                <field id="use_proxy" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1">
                     <label>API Uses Proxy</label>
                     <config_path>paypal/wpp/use_proxy</config_path>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="proxy_host" translate="label" type="text" sortOrder="100" showInDefault="1"
-                       showInWebsite="1">
+                <field id="proxy_host" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1">
                     <label>Proxy Host</label>
                     <config_path>paypal/wpp/proxy_host</config_path>
                     <attribute type="shared">1</attribute>
@@ -139,8 +126,7 @@
                         <field id="use_proxy">1</field>
                     </depends>
                 </field>
-                <field id="proxy_port" translate="label comment" type="text" sortOrder="110" showInDefault="1"
-                       showInWebsite="1">
+                <field id="proxy_port" translate="label comment" type="text" sortOrder="110" showInDefault="1" showInWebsite="1">
                     <label>Proxy Port</label>
                     <comment>Please enter at least 0 and at most 65535</comment>
                     <config_path>paypal/wpp/proxy_port</config_path>
@@ -151,8 +137,7 @@
                     <validate>validate-digits validate-digits-range digits-range-0-65535</validate>
                 </field>
             </group>
-            <field id="enable_express_checkout" translate="label" type="select" sortOrder="20" showInDefault="1"
-                   showInWebsite="1">
+            <field id="enable_express_checkout" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
                 <label>Enable this Solution</label>
                 <config_path>payment/paypal_express/active</config_path>
                 <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -161,8 +146,7 @@
                     <group id="express_checkout_required_express_checkout"/>
                 </requires>
             </field>
-            <field id="enable_in_context_checkout" translate="label comment" type="select" sortOrder="21"
-                   showInDefault="1" showInWebsite="1">
+            <field id="enable_in_context_checkout" translate="label comment" type="select" sortOrder="21" showInDefault="1" showInWebsite="1">
                 <label>Enable In-Context Checkout Experience</label>
                 <comment>
                     <![CDATA[See PayPal Feature Support details and list of supported regions
@@ -177,12 +161,7 @@
             </field>
             <field id="merchant_id" translate="label" type="text" sortOrder="22" showInDefault="1" showInWebsite="1">
                 <label>Merchant Account ID</label>
-                <tooltip>You can look up your merchant ID by logging into https://www.paypal.com/. Click the profile
-                    icon on the top right side of the page and then select Profile and settings in the Business Profile
-                    menu. (If you do not see the profile icon at the top of the page, click Profile, which appears in
-                    the top menu when the My Account tab is selected.) Click My business info on the left, and the
-                    Merchant account ID is displayed in the list of profile items on the right.
-                </tooltip>
+                <tooltip>You can look up your merchant ID by logging into https://www.paypal.com/. Click the profile icon on the top right side of the page and then select Profile and settings in the Business Profile menu. (If you do not see the profile icon at the top of the page, click Profile, which appears in the top menu when the My Account tab is selected.) Click My business info on the left, and the Merchant account ID is displayed in the list of profile items on the right.</tooltip>
                 <config_path>payment/paypal_express/merchant_id</config_path>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\MerchantId</frontend_model>
                 <validate>required-entry</validate>
@@ -190,8 +169,7 @@
                     <field id="enable_in_context_checkout">1</field>
                 </depends>
             </field>
-            <field id="enable_express_checkout_bml" translate="label comment" type="select" sortOrder="23"
-                   showInDefault="0" showInWebsite="0">
+            <field id="enable_express_checkout_bml" translate="label comment" type="select" sortOrder="23" showInDefault="0" showInWebsite="0">
                 <label>Enable PayPal Credit</label>
                 <comment><![CDATA[PayPal Express Checkout lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
@@ -204,20 +182,17 @@
                     <field id="enable_express_checkout"/>
                 </requires>
             </field>
-            <field id="express_checkout_bml_sort_order" translate="label" type="text" sortOrder="25" showInDefault="0"
-                   showInWebsite="0" showInStore="0">
+            <field id="express_checkout_bml_sort_order" translate="label" type="text" sortOrder="25" showInDefault="0" showInWebsite="0" showInStore="0">
                 <label>Sort Order PayPal Credit</label>
                 <config_path>payment/paypal_express_bml/sort_order</config_path>
                 <frontend_class>validate-number</frontend_class>
                 <attribute type="shared">1</attribute>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlApiSortOrder
-                </frontend_model>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlApiSortOrder</frontend_model>
                 <depends>
                     <field id="enable_express_checkout_bml">1</field>
                 </depends>
             </field>
-            <field id="enable_paypal_paylater_experience" translate="label comment" type="select" sortOrder="27"
-                   showInDefault="1" showInWebsite="1">
+            <field id="enable_paypal_paylater_experience" translate="label comment" type="select" sortOrder="27" showInDefault="1" showInWebsite="1">
                 <label>Enable PayPal PayLater Experience</label>
                 <comment>
                     <![CDATA[Recommended. <strong>Advertise PayPal Credit</strong> is deprecated.
@@ -243,8 +218,7 @@
                 <depends>
                     <field id="enable_paypal_paylater_experience">0</field>
                 </depends>
-                <field id="bml_publisher_id" translate="label comment tooltip" showInDefault="1" showInWebsite="1"
-                       sortOrder="10">
+                <field id="bml_publisher_id" translate="label comment tooltip" showInDefault="1" showInWebsite="1" sortOrder="10">
                     <label>Publisher ID</label>
                     <comment><![CDATA[Required to display a banner]]></comment>
                     <config_path>payment/paypal_express_bml/publisher_id</config_path>
@@ -252,30 +226,24 @@
                 </field>
                 <field id="bml_wizard" translate="button_label" sortOrder="15" showInDefault="1" showInWebsite="1">
                     <button_label>Get Publisher ID from PayPal</button_label>
-                    <button_url>
-                        <![CDATA[https://financing.paypal.com/ppfinportal/cart/index?dcp=4eff8563b9cc505e0b9afaff3256705081553c79]]></button_url>
+                    <button_url><![CDATA[https://financing.paypal.com/ppfinportal/cart/index?dcp=4eff8563b9cc505e0b9afaff3256705081553c79]]></button_url>
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\BmlApiWizard</frontend_model>
                 </field>
-                <group id="settings_bml_homepage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1"
-                       sortOrder="20">
+                <group id="settings_bml_homepage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
                     <label>Home Page</label>
-                    <field id="bml_homepage_display" translate="label" type="select" showInDefault="1" showInWebsite="1"
-                           sortOrder="10">
+                    <field id="bml_homepage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
                         <label>Display</label>
                         <config_path>payment/paypal_express_bml/homepage_display</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="bml_homepage_position" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="20">
+                    <field id="bml_homepage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
                         <label>Position</label>
                         <config_path>payment/paypal_express_bml/homepage_position</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsHP
-                        </source_model>
+                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsHP</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="bml_homepage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1"
-                           sortOrder="30">
+                    <field id="bml_homepage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
                         <label>Size</label>
                         <config_path>payment/paypal_express_bml/homepage_size</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH</source_model>
@@ -284,130 +252,96 @@
                             <field id="bml_homepage_position">0</field>
                         </depends>
                     </field>
-                    <field id="bml_homepage_size2"
-                           extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_size1">
+                    <field id="bml_homepage_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_size1">
                         <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS</source_model>
                         <depends>
                             <field id="bml_homepage_position">1</field>
                         </depends>
                     </field>
                 </group>
-                <group id="settings_bml_categorypage" translate="label" sortOrder="30" showInDefault="1"
-                       showInWebsite="1" showInStore="1">
+                <group id="settings_bml_categorypage" translate="label" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Catalog Category Page</label>
-                    <field id="bml_categorypage_display" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="10">
+                    <field id="bml_categorypage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
                         <label>Display</label>
                         <config_path>payment/paypal_express_bml/categorypage_display</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="bml_categorypage_position" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="20">
+                    <field id="bml_categorypage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
                         <label>Position</label>
                         <config_path>payment/paypal_express_bml/categorypage_position</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCCP
-                        </source_model>
+                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCCP</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="bml_categorypage_size1" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="30">
+                    <field id="bml_categorypage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
                         <label>Size</label>
                         <config_path>payment/paypal_express_bml/categorypage_size</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC</source_model>
                         <attribute type="shared">1</attribute>
-                        <depends>
-                            <field id="bml_categorypage_position">0</field>
-                        </depends>
+                        <depends><field id="bml_categorypage_position">0</field></depends>
                     </field>
-                    <field id="bml_categorypage_size2"
-                           extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_size1">
+                    <field id="bml_categorypage_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_size1">
                         <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS</source_model>
-                        <depends>
-                            <field id="bml_categorypage_position">1</field>
-                        </depends>
+                        <depends><field id="bml_categorypage_position">1</field></depends>
                     </field>
                 </group>
-                <group id="settings_bml_productpage" translate="label" showInDefault="1" showInWebsite="1"
-                       showInStore="1" sortOrder="40">
+                <group id="settings_bml_productpage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
                     <label>Catalog Product Page</label>
-                    <field id="bml_productpage_display" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="10">
+                    <field id="bml_productpage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
                         <label>Display</label>
                         <config_path>payment/paypal_express_bml/productpage_display</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="bml_productpage_position" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="20">
+                    <field id="bml_productpage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
                         <label>Position</label>
                         <config_path>payment/paypal_express_bml/productpage_position</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCPP
-                        </source_model>
+                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCPP</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="bml_productpage_size1" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="30">
+                    <field id="bml_productpage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
                         <label>Size</label>
                         <config_path>payment/paypal_express_bml/productpage_size</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC</source_model>
                         <attribute type="shared">1</attribute>
-                        <depends>
-                            <field id="bml_productpage_position">0</field>
-                        </depends>
+                        <depends><field id="bml_productpage_position">0</field></depends>
                     </field>
-                    <field id="bml_productpage_size2"
-                           extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_size1">
+                    <field id="bml_productpage_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_size1">
                         <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN</source_model>
-                        <depends>
-                            <field id="bml_productpage_position">1</field>
-                        </depends>
+                        <depends><field id="bml_productpage_position">1</field></depends>
                     </field>
                 </group>
-                <group id="settings_bml_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1"
-                       sortOrder="50">
+                <group id="settings_bml_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
                     <label>Checkout Cart Page</label>
-                    <field id="bml_checkout_display" translate="label" type="select" showInDefault="1" showInWebsite="1"
-                           sortOrder="10">
+                    <field id="bml_checkout_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
                         <label>Display</label>
                         <config_path>payment/paypal_express_bml/checkout_display</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="bml_checkout_position" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="20">
+                    <field id="bml_checkout_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
                         <label>Position</label>
                         <config_path>payment/paypal_express_bml/checkout_position</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCheckout
-                        </source_model>
+                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCheckout</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="bml_checkout_size1" translate="label" type="select" showInDefault="1" showInWebsite="1"
-                           sortOrder="30">
+                    <field id="bml_checkout_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
                         <label>Size</label>
                         <config_path>payment/paypal_express_bml/checkout_size</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC
-                        </source_model>
+                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC</source_model>
                         <attribute type="shared">1</attribute>
-                        <depends>
-                            <field id="bml_checkout_position">0</field>
-                        </depends>
+                        <depends><field id="bml_checkout_position">0</field></depends>
                     </field>
-                    <field id="bml_checkout_size2"
-                           extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_size1">
-                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN
-                        </source_model>
+                    <field id="bml_checkout_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_size1">
+                        <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN</source_model>
                         <attribute type="shared">1</attribute>
-                        <depends>
-                            <field id="bml_checkout_position">1</field>
-                        </depends>
+                        <depends><field id="bml_checkout_position">1</field></depends>
                     </field>
                 </group>
             </group>
             <group id="advertise_paylater" translate="label" showInDefault="1" showInWebsite="1" sortOrder="40">
                 <label>Advertise PayPal PayLater</label>
-                <field id="paylater_enabled" translate="label" type="select" showInDefault="1" showInWebsite="1"
-                       sortOrder="10">
+                <field id="paylater_enabled" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
                     <label>Enable PayPal PayLater</label>
                     <config_path>payment/paypal_paylater/enabled</config_path>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -416,32 +350,27 @@
                 <depends>
                     <field id="enable_paypal_paylater_experience">1</field>
                 </depends>
-                <group id="settings_paylater_homepage" translate="label" showInDefault="1" showInWebsite="1"
-                       showInStore="1" sortOrder="20">
+                <group id="settings_paylater_homepage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
                     <label>Home Page</label>
                     <depends>
                         <field id="paylater_enabled">1</field>
                     </depends>
-                    <field id="paylater_homepage_display" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="10">
+                    <field id="paylater_homepage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
                         <label>Display</label>
                         <config_path>payment/paypal_paylater/homepage_display</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paylater_homepage_position" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="20">
+                    <field id="paylater_homepage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
                         <label>Position</label>
                         <config_path>payment/paypal_paylater/homepage_position</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsHP
-                        </source_model>
+                        <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsHP</source_model>
                         <attribute type="shared">1</attribute>
                         <depends>
                             <field id="paylater_homepage_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_homepage_stylelayout" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="30">
+                    <field id="paylater_homepage_stylelayout" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
                         <label>Style Layout</label>
                         <config_path>payment/paypal_paylater/homepage_stylelayout</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\StyleLayout</source_model>
@@ -450,8 +379,7 @@
                             <field id="paylater_homepage_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_homepage_logotype" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="40">
+                    <field id="paylater_homepage_logotype" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="40">
                         <label>Logo Type</label>
                         <config_path>payment/paypal_paylater/homepage_logotype</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoType</source_model>
@@ -461,8 +389,7 @@
                             <field id="paylater_homepage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_homepage_logoposition" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="50">
+                    <field id="paylater_homepage_logoposition" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="50">
                         <label>Logo Position</label>
                         <config_path>payment/paypal_paylater/homepage_logoposition</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoPosition</source_model>
@@ -473,8 +400,7 @@
                             <field id="paylater_homepage_logotype" separator=",">primary,alternative</field>
                         </depends>
                     </field>
-                    <field id="paylater_homepage_textcolor" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="60">
+                    <field id="paylater_homepage_textcolor" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="60">
                         <label>Text Color</label>
                         <config_path>payment/paypal_paylater/homepage_textcolor</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextColor</source_model>
@@ -484,8 +410,7 @@
                             <field id="paylater_homepage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_homepage_textsize" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="70">
+                    <field id="paylater_homepage_textsize" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="70">
                         <label>Text Size</label>
                         <config_path>payment/paypal_paylater/homepage_textsize</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextSize</source_model>
@@ -495,8 +420,7 @@
                             <field id="paylater_homepage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_homepage_ratio" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="80">
+                    <field id="paylater_homepage_ratio" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="80">
                         <label>Ratio</label>
                         <config_path>payment/paypal_paylater/homepage_ratio</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Ratio</source_model>
@@ -506,8 +430,7 @@
                             <field id="paylater_homepage_stylelayout">flex</field>
                         </depends>
                     </field>
-                    <field id="paylater_homepage_color" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="90">
+                    <field id="paylater_homepage_color" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="90">
                         <label>Color</label>
                         <config_path>payment/paypal_paylater/homepage_color</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Color</source_model>
@@ -518,32 +441,27 @@
                         </depends>
                     </field>
                 </group>
-                <group id="settings_paylater_productpage" translate="label" showInDefault="1" showInWebsite="1"
-                       showInStore="1" sortOrder="30">
+                <group id="settings_paylater_productpage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
                     <label>Catalog Product Page</label>
                     <depends>
                         <field id="paylater_enabled">1</field>
                     </depends>
-                    <field id="paylater_productpage_display" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="10">
+                    <field id="paylater_productpage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
                         <label>Display</label>
                         <config_path>payment/paypal_paylater/productpage_display</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paylater_productpage_position" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="20">
+                    <field id="paylater_productpage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
                         <label>Position</label>
                         <config_path>payment/paypal_paylater/productpage_position</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsCPP
-                        </source_model>
+                        <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsCPP</source_model>
                         <attribute type="shared">1</attribute>
                         <depends>
                             <field id="paylater_productpage_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_productpage_stylelayout" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="30">
+                    <field id="paylater_productpage_stylelayout" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
                         <label>Style Layout</label>
                         <config_path>payment/paypal_paylater/productpage_stylelayout</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\StyleLayout</source_model>
@@ -552,8 +470,7 @@
                             <field id="paylater_productpage_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_productpage_logotype" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="40">
+                    <field id="paylater_productpage_logotype" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="40">
                         <label>Logo Type</label>
                         <config_path>payment/paypal_paylater/productpage_logotype</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoType</source_model>
@@ -563,8 +480,7 @@
                             <field id="paylater_productpage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_productpage_logoposition" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="50">
+                    <field id="paylater_productpage_logoposition" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="50">
                         <label>Logo Position</label>
                         <config_path>payment/paypal_paylater/productpage_logoposition</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoPosition</source_model>
@@ -575,8 +491,7 @@
                             <field id="paylater_productpage_logotype" separator=",">primary,alternative</field>
                         </depends>
                     </field>
-                    <field id="paylater_productpage_textcolor" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="60">
+                    <field id="paylater_productpage_textcolor" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="60">
                         <label>Text Color</label>
                         <config_path>payment/paypal_paylater/productpage_textcolor</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextColor</source_model>
@@ -586,8 +501,7 @@
                             <field id="paylater_productpage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_productpage_textsize" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="70">
+                    <field id="paylater_productpage_textsize" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="70">
                         <label>Text Size</label>
                         <config_path>payment/paypal_paylater/productpage_textsize</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextSize</source_model>
@@ -597,8 +511,7 @@
                             <field id="paylater_productpage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_productpage_ratio" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="80">
+                    <field id="paylater_productpage_ratio" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="80">
                         <label>Ratio</label>
                         <config_path>payment/paypal_paylater/productpage_ratio</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Ratio</source_model>
@@ -608,8 +521,7 @@
                             <field id="paylater_productpage_stylelayout">flex</field>
                         </depends>
                     </field>
-                    <field id="paylater_productpage_color" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="90">
+                    <field id="paylater_productpage_color" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="90">
                         <label>Color</label>
                         <config_path>payment/paypal_paylater/productpage_color</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Color</source_model>
@@ -620,32 +532,27 @@
                         </depends>
                     </field>
                 </group>
-                <group id="settings_paylater_cartpage" translate="label" showInDefault="1" showInWebsite="1"
-                       showInStore="1" sortOrder="40">
+                <group id="settings_paylater_cartpage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
                     <label>Checkout Cart Page</label>
                     <depends>
                         <field id="paylater_enabled">1</field>
                     </depends>
-                    <field id="paylater_cartpage_display" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="10">
+                    <field id="paylater_cartpage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
                         <label>Display</label>
                         <config_path>payment/paypal_paylater/cartpage_display</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paylater_cartpage_position" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="20">
+                    <field id="paylater_cartpage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
                         <label>Position</label>
                         <config_path>payment/paypal_paylater/cartpage_position</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsCart
-                        </source_model>
+                        <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsCart</source_model>
                         <attribute type="shared">1</attribute>
                         <depends>
                             <field id="paylater_cartpage_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_cartpage_stylelayout" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="30">
+                    <field id="paylater_cartpage_stylelayout" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
                         <label>Style Layout</label>
                         <config_path>payment/paypal_paylater/cartpage_stylelayout</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\StyleLayout</source_model>
@@ -654,8 +561,7 @@
                             <field id="paylater_cartpage_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_cartpage_logotype" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="40">
+                    <field id="paylater_cartpage_logotype" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="40">
                         <label>Logo Type</label>
                         <config_path>payment/paypal_paylater/cartpage_logotype</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoType</source_model>
@@ -665,8 +571,7 @@
                             <field id="paylater_cartpage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_cartpage_logoposition" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="50">
+                    <field id="paylater_cartpage_logoposition" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="50">
                         <label>Logo Position</label>
                         <config_path>payment/paypal_paylater/cartpage_logoposition</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoPosition</source_model>
@@ -677,8 +582,7 @@
                             <field id="paylater_cartpage_logotype" separator=",">primary,alternative</field>
                         </depends>
                     </field>
-                    <field id="paylater_cartpage_textcolor" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="60">
+                    <field id="paylater_cartpage_textcolor" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="60">
                         <label>Text Color</label>
                         <config_path>payment/paypal_paylater/cartpage_textcolor</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextColor</source_model>
@@ -688,8 +592,7 @@
                             <field id="paylater_cartpage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_cartpage_textsize" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="70">
+                    <field id="paylater_cartpage_textsize" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="70">
                         <label>Text Size</label>
                         <config_path>payment/paypal_paylater/cartpage_textsize</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextSize</source_model>
@@ -699,8 +602,7 @@
                             <field id="paylater_cartpage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_cartpage_ratio" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="80">
+                    <field id="paylater_cartpage_ratio" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="80">
                         <label>Ratio</label>
                         <config_path>payment/paypal_paylater/cartpage_ratio</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Ratio</source_model>
@@ -710,8 +612,7 @@
                             <field id="paylater_cartpage_stylelayout">flex</field>
                         </depends>
                     </field>
-                    <field id="paylater_cartpage_color" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="90">
+                    <field id="paylater_cartpage_color" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="90">
                         <label>Color</label>
                         <config_path>payment/paypal_paylater/cartpage_color</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Color</source_model>
@@ -722,33 +623,27 @@
                         </depends>
                     </field>
                 </group>
-                <group id="settings_paylater_checkout_payment" translate="label" showInDefault="1" showInWebsite="1"
-                       showInStore="1" sortOrder="50">
+                <group id="settings_paylater_checkout_payment" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
                     <label>Checkout Payment Step</label>
                     <depends>
                         <field id="paylater_enabled">1</field>
                     </depends>
-                    <field id="paylater_checkout_payment_display" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="10">
+                    <field id="paylater_checkout_payment_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
                         <label>Display</label>
                         <config_path>payment/paypal_paylater/checkout_payment_display</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paylater_checkout_payment_position" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="20">
+                    <field id="paylater_checkout_payment_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
                         <label>Position</label>
                         <config_path>payment/paypal_paylater/checkout_payment_position</config_path>
-                        <source_model>
-                            Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsCheckout
-                        </source_model>
+                        <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsCheckout</source_model>
                         <attribute type="shared">1</attribute>
                         <depends>
                             <field id="paylater_checkout_payment_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_checkout_payment_stylelayout" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="30">
+                    <field id="paylater_checkout_payment_stylelayout" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
                         <label>Style Layout</label>
                         <config_path>payment/paypal_paylater/checkout_payment_stylelayout</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\StyleLayout</source_model>
@@ -757,8 +652,7 @@
                             <field id="paylater_checkout_payment_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_checkout_payment_logotype" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="40">
+                    <field id="paylater_checkout_payment_logotype" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="40">
                         <label>Logo Type</label>
                         <config_path>payment/paypal_paylater/checkout_payment_logotype</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoType</source_model>
@@ -768,8 +662,7 @@
                             <field id="paylater_checkout_payment_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_checkout_payment_logoposition" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="50">
+                    <field id="paylater_checkout_payment_logoposition" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="50">
                         <label>Logo Position</label>
                         <config_path>payment/paypal_paylater/checkout_payment_logoposition</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoPosition</source_model>
@@ -780,8 +673,7 @@
                             <field id="paylater_checkout_payment_logotype" separator=",">primary,alternative</field>
                         </depends>
                     </field>
-                    <field id="paylater_checkout_payment_textcolor" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="60">
+                    <field id="paylater_checkout_payment_textcolor" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="60">
                         <label>Text Color</label>
                         <config_path>payment/paypal_paylater/checkout_payment_textcolor</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextColor</source_model>
@@ -791,8 +683,7 @@
                             <field id="paylater_checkout_payment_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_checkout_payment_textsize" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="70">
+                    <field id="paylater_checkout_payment_textsize" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="70">
                         <label>Text Size</label>
                         <config_path>payment/paypal_paylater/checkout_payment_textsize</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextSize</source_model>
@@ -802,8 +693,7 @@
                             <field id="paylater_checkout_payment_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_checkout_payment_ratio" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="80">
+                    <field id="paylater_checkout_payment_ratio" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="80">
                         <label>Ratio</label>
                         <config_path>payment/paypal_paylater/checkout_payment_ratio</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Ratio</source_model>
@@ -813,8 +703,7 @@
                             <field id="paylater_checkout_payment_stylelayout">flex</field>
                         </depends>
                     </field>
-                    <field id="paylater_checkout_payment_color" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="90">
+                    <field id="paylater_checkout_payment_color" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="90">
                         <label>Color</label>
                         <config_path>payment/paypal_paylater/checkout_payment_color</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Color</source_model>
@@ -825,33 +714,27 @@
                         </depends>
                     </field>
                 </group>
-                <group id="settings_paylater_categorypage" translate="label" showInDefault="1" showInWebsite="1"
-                       showInStore="1" sortOrder="60">
+                <group id="settings_paylater_categorypage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
                     <label>Catalog Category Page</label>
                     <depends>
                         <field id="paylater_enabled">1</field>
                     </depends>
-                    <field id="paylater_categorypage_display" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="10">
+                    <field id="paylater_categorypage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
                         <label>Display</label>
                         <config_path>payment/paypal_paylater/categorypage_display</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paylater_categorypage_position" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="20">
+                    <field id="paylater_categorypage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
                         <label>Position</label>
                         <config_path>payment/paypal_paylater/categorypage_position</config_path>
-                        <source_model>
-                            Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsCategoryPage
-                        </source_model>
+                        <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Position::getPositionsCategoryPage</source_model>
                         <attribute type="shared">1</attribute>
                         <depends>
                             <field id="paylater_categorypage_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_categorypage_stylelayout" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="30">
+                    <field id="paylater_categorypage_stylelayout" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
                         <label>Style Layout</label>
                         <config_path>payment/paypal_paylater/categorypage_stylelayout</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\StyleLayout</source_model>
@@ -860,8 +743,7 @@
                             <field id="paylater_categorypage_display">1</field>
                         </depends>
                     </field>
-                    <field id="paylater_categorypage_logotype" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="40">
+                    <field id="paylater_categorypage_logotype" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="40">
                         <label>Logo Type</label>
                         <config_path>payment/paypal_paylater/categorypage_logotype</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoType</source_model>
@@ -871,8 +753,7 @@
                             <field id="paylater_categorypage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_categorypage_logoposition" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="50">
+                    <field id="paylater_categorypage_logoposition" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="50">
                         <label>Logo Position</label>
                         <config_path>payment/paypal_paylater/categorypage_logoposition</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\LogoPosition</source_model>
@@ -883,8 +764,7 @@
                             <field id="paylater_categorypage_logotype" separator=",">primary,alternative</field>
                         </depends>
                     </field>
-                    <field id="paylater_categorypage_textcolor" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="60">
+                    <field id="paylater_categorypage_textcolor" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="60">
                         <label>Text Color</label>
                         <config_path>payment/paypal_paylater/categorypage_textcolor</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextColor</source_model>
@@ -894,8 +774,7 @@
                             <field id="paylater_categorypage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_categorypage_textsize" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="70">
+                    <field id="paylater_categorypage_textsize" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="70">
                         <label>Text Size</label>
                         <config_path>payment/paypal_paylater/categorypage_textsize</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\TextSize</source_model>
@@ -905,8 +784,7 @@
                             <field id="paylater_categorypage_stylelayout">text</field>
                         </depends>
                     </field>
-                    <field id="paylater_categorypage_ratio" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="80">
+                    <field id="paylater_categorypage_ratio" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="80">
                         <label>Ratio</label>
                         <config_path>payment/paypal_paylater/categorypage_ratio</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Ratio</source_model>
@@ -916,8 +794,7 @@
                             <field id="paylater_categorypage_stylelayout">flex</field>
                         </depends>
                     </field>
-                    <field id="paylater_categorypage_color" translate="label" type="select" showInDefault="1"
-                           showInWebsite="1" sortOrder="90">
+                    <field id="paylater_categorypage_color" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="90">
                         <label>Color</label>
                         <config_path>payment/paypal_paylater/categorypage_color</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PayLater\Color</source_model>
@@ -933,40 +810,33 @@
         <group id="settings_ec" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
             <label>Basic Settings - PayPal Express Checkout</label>
             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-            <field id="title" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1"
-                   showInStore="1">
+            <field id="title" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Title</label>
                 <comment>It is recommended to set this value to "PayPal" per store views.</comment>
                 <config_path>payment/paypal_express/title</config_path>
                 <attribute type="shared">1</attribute>
             </field>
-            <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1"
-                   showInStore="1">
+            <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Sort Order</label>
                 <config_path>payment/paypal_express/sort_order</config_path>
                 <frontend_class>validate-number</frontend_class>
                 <attribute type="shared">1</attribute>
             </field>
-            <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1"
-                   showInWebsite="1">
+            <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
                 <label>Payment Action</label>
                 <config_path>payment/paypal_express/payment_action</config_path>
                 <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions\Express</source_model>
                 <attribute type="shared">1</attribute>
             </field>
-            <field id="visible_on_product" translate="label" type="select" sortOrder="40" showInDefault="1"
-                   showInWebsite="1" showInStore="1">
+            <field id="visible_on_product" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Display on Product Details Page</label>
                 <config_path>payment/paypal_express/visible_on_product</config_path>
                 <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 <attribute type="shared">1</attribute>
             </field>
-            <field id="authorization_honor_period" translate="label comment" type="text" sortOrder="50"
-                   showInDefault="1" showInWebsite="1">
+            <field id="authorization_honor_period" translate="label comment" type="text" sortOrder="50" showInDefault="1" showInWebsite="1">
                 <label>Authorization Honor Period (days)</label>
-                <comment>Specifies what the Authorization Honor Period is on the merchant&#8217;s PayPal account. It
-                    must mirror the setting in PayPal.
-                </comment>
+                <comment>Specifies what the Authorization Honor Period is on the merchant&#8217;s PayPal account. It must mirror the setting in PayPal.</comment>
                 <config_path>payment/paypal_express/authorization_honor_period</config_path>
                 <attribute type="shared">1</attribute>
                 <depends>
@@ -974,12 +844,9 @@
                 </depends>
                 <validate>validate-zero-or-greater validate-digits</validate>
             </field>
-            <field id="order_valid_period" translate="label comment" type="text" sortOrder="60" showInDefault="1"
-                   showInWebsite="1">
+            <field id="order_valid_period" translate="label comment" type="text" sortOrder="60" showInDefault="1" showInWebsite="1">
                 <label>Order Valid Period (days)</label>
-                <comment>Specifies what the Order Valid Period is on the merchant&#x2019;s PayPal account. It must
-                    mirror the setting in PayPal.
-                </comment>
+                <comment>Specifies what the Order Valid Period is on the merchant&#x2019;s PayPal account. It must mirror the setting in PayPal.</comment>
                 <config_path>payment/paypal_express/order_valid_period</config_path>
                 <attribute type="shared">1</attribute>
                 <depends>
@@ -987,39 +854,32 @@
                 </depends>
                 <validate>validate-zero-or-greater validate-digits</validate>
             </field>
-            <field id="child_authorization_number" translate="label comment" type="text" sortOrder="70"
-                   showInDefault="1" showInWebsite="1">
+            <field id="child_authorization_number" translate="label comment" type="text" sortOrder="70" showInDefault="1" showInWebsite="1">
                 <label>Number of Child Authorizations</label>
-                <comment>The default number of child authorizations in your PayPal account is 1. To do multiple
-                    authorizations please contact PayPal to request an increase.
-                </comment>
+                <comment>The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.</comment>
                 <config_path>payment/paypal_express/child_authorization_number</config_path>
                 <attribute type="shared">1</attribute>
                 <depends>
                     <field id="payment_action">Order</field>
                 </depends>
             </field>
-            <group id="settings_ec_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1"
-                   sortOrder="80">
+            <group id="settings_ec_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="80">
                 <label>Advanced Settings</label>
                 <fieldset_css>config-advanced</fieldset_css>
-                <field id="visible_on_cart" translate="label comment" type="select" sortOrder="5" showInDefault="1"
-                       showInWebsite="1" showInStore="1">
+                <field id="visible_on_cart" translate="label comment" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Display on Shopping Cart</label>
                     <config_path>payment/paypal_express/visible_on_cart</config_path>
                     <comment>Also affects mini-shopping cart.</comment>
                     <source_model>Magento\Paypal\Model\System\Config\Source\Yesnoshortcut</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="allowspecific" translate="label" type="select" sortOrder="10" showInDefault="1"
-                       showInWebsite="1">
+                <field id="allowspecific" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
                     <label>Payment Applicable From</label>
                     <config_path>payment/paypal_express/allowspecific</config_path>
                     <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="specificcountry" translate="label" type="multiselect" sortOrder="20" showInDefault="1"
-                       showInWebsite="1">
+                <field id="specificcountry" translate="label" type="multiselect" sortOrder="20" showInDefault="1" showInWebsite="1">
                     <label>Countries Payment Applicable From</label>
                     <config_path>payment/paypal_express/specificcountry</config_path>
                     <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
@@ -1034,67 +894,52 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1"
-                       showInWebsite="1">
+                <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1">
                     <label>Enable SSL verification</label>
                     <config_path>payment/paypal_express/verify_peer</config_path>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="line_items_enabled" translate="label" type="select" sortOrder="40" showInDefault="1"
-                       showInWebsite="1">
+                <field id="line_items_enabled" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
                     <label>Transfer Cart Line Items</label>
                     <config_path>payment/paypal_express/line_items_enabled</config_path>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="transfer_shipping_options" translate="label tooltip comment" type="select" sortOrder="50"
-                       showInDefault="1" showInWebsite="1">
+                <field id="transfer_shipping_options" translate="label tooltip comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
                     <label>Transfer Shipping Options</label>
                     <config_path>payment/paypal_express/transfer_shipping_options</config_path>
-                    <tooltip>If this option is enabled, customer can change shipping address and shipping method on
-                        PayPal website. In live mode works via HTTPS protocol only.
-                    </tooltip>
-                    <comment>Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer
-                        only first 10 cheapest shipping options if there are more than 10 available.
-                    </comment>
+                    <tooltip>If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.</tooltip>
+                    <comment>Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                     <depends>
                         <field id="line_items_enabled">1</field>
                     </depends>
                 </field>
-                <field id="button_flavor" translate="label" type="select" sortOrder="60" showInDefault="1"
-                       showInWebsite="1" showInStore="1">
+                <field id="button_flavor" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Shortcut Buttons Flavor</label>
                     <config_path>paypal/wpp/button_flavor</config_path>
                     <source_model>Magento\Paypal\Model\Config::getExpressCheckoutButtonFlavors</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="solution_type" translate="label comment" type="select" sortOrder="70" showInDefault="1"
-                       showInWebsite="1">
+                <field id="solution_type" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
                     <label>Enable PayPal Guest Checkout</label>
                     <comment>Ability for buyer to purchase without PayPal account.</comment>
                     <config_path>payment/paypal_express/solution_type</config_path>
                     <source_model>Magento\Paypal\Model\Config::getExpressCheckoutSolutionTypes</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="require_billing_address" translate="label comment" type="select" sortOrder="80"
-                       showInDefault="1" showInWebsite="1">
+                <field id="require_billing_address" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
                     <label>Require Customer's Billing Address</label>
-                    <comment>This feature needs be enabled first for the merchant account through PayPal technical
-                        support.
-                    </comment>
+                    <comment>This feature needs be enabled first for the merchant account through PayPal technical support.</comment>
                     <config_path>payment/paypal_express/require_billing_address</config_path>
                     <source_model>Magento\Paypal\Model\System\Config\Source\RequireBillingAddress</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="allow_ba_signup" translate="label comment tooltip" type="select" sortOrder="90"
-                       showInDefault="1" showInWebsite="1">
+                <field id="allow_ba_signup" translate="label comment tooltip" type="select" sortOrder="90" showInDefault="1" showInWebsite="1">
                     <label>Billing Agreement Signup</label>
-                    <comment>Whether to create a billing agreement, if there are no active billing agreements
-                        available.
-                    </comment>
+                    <comment>Whether to create a billing agreement, if there are no active billing agreements available.</comment>
                     <tooltip>
                         <![CDATA[Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.]]>
                     </tooltip>
@@ -1102,18 +947,15 @@
                     <source_model>Magento\Paypal\Model\Config::getExpressCheckoutBASignupOptions</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="skip_order_review_step" translate="label" type="select" sortOrder="95" showInDefault="1"
-                       showInWebsite="1">
+                <field id="skip_order_review_step" translate="label" type="select" sortOrder="95" showInDefault="1" showInWebsite="1">
                     <label>Skip Order Review Step</label>
                     <config_path>payment/paypal_express/skip_order_review_step</config_path>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
-                <group id="express_checkout_billing_agreement" translate="label" showInDefault="1" showInWebsite="1"
-                       showInStore="1" sortOrder="100">
+                <group id="express_checkout_billing_agreement" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
                     <label>PayPal Billing Agreement Settings</label>
-                    <field id="active" translate="label comment" type="select" sortOrder="10" showInDefault="1"
-                           showInWebsite="1">
+                    <field id="active" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
                         <label>Enabled</label>
                         <comment>
                             <![CDATA[Will appear as a payment option only for customers who have at least one active billing agreement.]]>
@@ -1122,35 +964,30 @@
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1"
-                           showInStore="1">
+                    <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Title</label>
                         <config_path>payment/paypal_billing_agreement/title</config_path>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1"
-                           showInWebsite="1" showInStore="1">
+                    <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Sort Order</label>
                         <config_path>payment/paypal_billing_agreement/sort_order</config_path>
                         <frontend_class>validate-number</frontend_class>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="payment_action" translate="label" type="select" sortOrder="40" showInDefault="1"
-                           showInWebsite="1">
+                    <field id="payment_action" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
                         <label>Payment Action</label>
                         <config_path>payment/paypal_billing_agreement/payment_action</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="allowspecific" translate="label" type="select" sortOrder="50" showInDefault="1"
-                           showInWebsite="1">
+                    <field id="allowspecific" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
                         <label>Payment Applicable From</label>
                         <config_path>payment/paypal_billing_agreement/allowspecific</config_path>
                         <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="specificcountry" translate="label" type="multiselect" sortOrder="60" showInDefault="1"
-                           showInWebsite="1">
+                    <field id="specificcountry" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1">
                         <label>Countries Payment Applicable From</label>
                         <config_path>payment/paypal_billing_agreement/specificcountry</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
@@ -1159,66 +996,57 @@
                             <field id="allowspecific">1</field>
                         </depends>
                     </field>
-                    <field id="debug" translate="label" type="select" sortOrder="70" showInDefault="1"
-                           showInWebsite="1">
+                    <field id="debug" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
                         <label>Debug Mode</label>
                         <config_path>payment/paypal_billing_agreement/debug</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="verify_peer" translate="label" type="select" sortOrder="75" showInDefault="1"
-                           showInWebsite="1">
+                    <field id="verify_peer" translate="label" type="select" sortOrder="75" showInDefault="1" showInWebsite="1">
                         <label>Enable SSL verification</label>
                         <config_path>payment/paypal_billing_agreement/verify_peer</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="line_items_enabled" translate="label" type="select" sortOrder="80" showInDefault="1"
-                           showInWebsite="1">
+                    <field id="line_items_enabled" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
                         <label>Transfer Cart Line Items</label>
                         <config_path>payment/paypal_billing_agreement/line_items_enabled</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="allow_billing_agreement_wizard" translate="label" type="select" sortOrder="90"
-                           showInDefault="1" showInWebsite="1">
+                    <field id="allow_billing_agreement_wizard" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1">
                         <label>Allow in Billing Agreement Wizard</label>
                         <config_path>payment/paypal_billing_agreement/allow_billing_agreement_wizard</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
                 </group>
-                <group id="express_checkout_settlement_report" translate="label" showInDefault="1" showInWebsite="1"
-                       sortOrder="110">
+                <group id="express_checkout_settlement_report" translate="label" showInDefault="1" showInWebsite="1" sortOrder="110">
                     <label>Settlement Report Settings</label>
                     <field id="heading_sftp" translate="label" sortOrder="10" showInDefault="1" showInWebsite="1">
                         <label>SFTP Credentials</label>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="settlement_reports_ftp_login" translate="label" type="obscure" sortOrder="20"
-                           showInDefault="1" showInWebsite="1">
+                    <field id="settlement_reports_ftp_login" translate="label" type="obscure" sortOrder="20" showInDefault="1" showInWebsite="1">
                         <label>Login</label>
                         <config_path>paypal/fetch_reports/ftp_login</config_path>
                         <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="settlement_reports_ftp_password" translate="label" type="obscure" sortOrder="30"
-                           showInDefault="1" showInWebsite="1">
+                    <field id="settlement_reports_ftp_password" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
                         <label>Password</label>
                         <config_path>paypal/fetch_reports/ftp_password</config_path>
                         <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="settlement_reports_ftp_sandbox" translate="label" type="select" sortOrder="40"
-                           showInDefault="1" showInWebsite="1">
+                    <field id="settlement_reports_ftp_sandbox" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
                         <label>Sandbox Mode</label>
                         <config_path>paypal/fetch_reports/ftp_sandbox</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="settlement_reports_ftp_ip" translate="label comment tooltip" type="text" sortOrder="50"
-                           showInDefault="1" showInWebsite="1">
+                    <field id="settlement_reports_ftp_ip" translate="label comment tooltip" type="text" sortOrder="50" showInDefault="1" showInWebsite="1">
                         <label>Custom Endpoint Hostname or IP-Address</label>
                         <comment>By default it is "reports.paypal.com".</comment>
                         <tooltip>Use colon to specify port. For example: "test.example.com:5224".</tooltip>
@@ -1228,8 +1056,7 @@
                             <field id="settlement_reports_ftp_sandbox">0</field>
                         </depends>
                     </field>
-                    <field id="settlement_reports_ftp_path" translate="label comeent" type="text" sortOrder="60"
-                           showInDefault="1" showInWebsite="1">
+                    <field id="settlement_reports_ftp_path" translate="label comeent" type="text" sortOrder="60" showInDefault="1" showInWebsite="1">
                         <label>Custom Path</label>
                         <comment>By default it is "/ppreports/outgoing".</comment>
                         <config_path>paypal/fetch_reports/ftp_path</config_path>
@@ -1243,15 +1070,13 @@
                         <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="settlement_reports_active" translate="label" type="select" sortOrder="80"
-                           showInDefault="1" showInWebsite="1">
+                    <field id="settlement_reports_active" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
                         <label>Enable Automatic Fetching</label>
                         <config_path>paypal/fetch_reports/active</config_path>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="settlement_reports_schedule" translate="label comment" type="select" sortOrder="90"
-                           showInDefault="1">
+                    <field id="settlement_reports_schedule" translate="label comment" type="select" sortOrder="90" showInDefault="1">
                         <label>Schedule</label>
                         <comment>PayPal retains reports for 45 days.</comment>
                         <config_path>paypal/fetch_reports/schedule</config_path>
@@ -1264,25 +1089,21 @@
                         <attribute type="shared">1</attribute>
                     </field>
                 </group>
-                <group id="express_checkout_frontend" translate="label" showInDefault="1" showInWebsite="1"
-                       showInStore="1" sortOrder="120">
+                <group id="express_checkout_frontend" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="120">
                     <label>Frontend Experience Settings</label>
-                    <field id="logo" translate="label comment" type="select" sortOrder="10" showInDefault="1"
-                           showInWebsite="1" showInStore="1">
+                    <field id="logo" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>PayPal Product Logo</label>
                         <comment>Displays on catalog pages and homepage.</comment>
                         <config_path>paypal/style/logo</config_path>
                         <source_model>Magento\Paypal\Model\System\Config\Source\Logo</source_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paypal_pages" translate="label" sortOrder="20" showInDefault="1" showInWebsite="1"
-                           showInStore="1">
+                    <field id="paypal_pages" translate="label" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>PayPal Merchant Pages Style</label>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="page_style" translate="label tooltip" type="text" sortOrder="30" showInDefault="1"
-                           showInWebsite="1" showInStore="1">
+                    <field id="page_style" translate="label tooltip" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Page Style</label>
                         <config_path>paypal/style/page_style</config_path>
                         <tooltip>
@@ -1290,8 +1111,7 @@
                         </tooltip>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paypal_hdrimg" translate="label tooltip" sortOrder="40" showInDefault="1"
-                           showInWebsite="1" showInStore="1">
+                    <field id="paypal_hdrimg" translate="label tooltip" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Header Image URL</label>
                         <config_path>paypal/style/paypal_hdrimg</config_path>
                         <tooltip>
@@ -1299,8 +1119,7 @@
                         </tooltip>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paypal_hdrbackcolor" translate="label tooltip" sortOrder="50" showInDefault="1"
-                           showInWebsite="1" showInStore="1">
+                    <field id="paypal_hdrbackcolor" translate="label tooltip" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Header Background Color</label>
                         <config_path>paypal/style/paypal_hdrbackcolor</config_path>
                         <tooltip>
@@ -1308,15 +1127,13 @@
                         </tooltip>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paypal_hdrbordercolor" translate="label tooltip" sortOrder="60" showInDefault="1"
-                           showInWebsite="1" showInStore="1">
+                    <field id="paypal_hdrbordercolor" translate="label tooltip" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Header Border Color</label>
                         <config_path>paypal/style/paypal_hdrbordercolor</config_path>
                         <tooltip>2-pixel perimeter around the header space.</tooltip>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="paypal_payflowcolor" translate="label tooltip" sortOrder="70" showInDefault="1"
-                           showInWebsite="1" showInStore="1">
+                    <field id="paypal_payflowcolor" translate="label tooltip" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Page Background Color</label>
                         <config_path>paypal/style/paypal_payflowcolor</config_path>
                         <tooltip>
@@ -1324,93 +1141,73 @@
                         </tooltip>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <field id="checkout_display" translate="label" sortOrder="80" showInDefault="1" showInWebsite="1"
-                           showInStore="1">
+                    <field id="checkout_display" translate="label" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Customize Smart Buttons</label>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <group id="checkout_page_button" translate="label" showInDefault="1" showInWebsite="1"
-                           showInStore="1" sortOrder="90">
+                    <group id="checkout_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
                         <label>Checkout Page</label>
-                        <field id="checkout_page_button_customize" translate="label" type="select" showInDefault="1"
-                               showInWebsite="1" showInStore="1" sortOrder="10">
+                        <field id="checkout_page_button_customize" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
                             <label>Customize Button</label>
                             <config_path>paypal/style/checkout_page_button_customize</config_path>
                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                             <attribute type="shared">1</attribute>
                         </field>
-                        <field id="checkout_page_button_label" translate="label comment" type="select" showInDefault="1"
-                               showInWebsite="1" showInStore="1" sortOrder="20">
+                        <field id="checkout_page_button_label" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
                             <label>Label</label>
-                            <comment>
-                                <![CDATA[The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.]]></comment>
+                            <comment><![CDATA[The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.]]></comment>
                             <config_path>paypal/style/checkout_page_button_label</config_path>
-                            <frontend_model>
-                                Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\ButtonStylesLabel
-                            </frontend_model>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLabel
-                            </source_model>
+                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\ButtonStylesLabel</frontend_model>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLabel</source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>
-                        <field id="checkout_page_button_mx_installment_period" translate="label" type="select"
-                               showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+                        <field id="checkout_page_button_mx_installment_period" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
                             <label>Mexico Installment Period</label>
                             <config_path>paypal/style/checkout_page_button_mx_installment_period</config_path>
-                            <source_model>
-                                Magento\Paypal\Model\System\Config\Source\ButtonStyles::getMxInstallmentPeriod
-                            </source_model>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getMxInstallmentPeriod</source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                                 <field id="checkout_page_button_label">installment</field>
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>
-                        <field id="checkout_page_button_br_installment_period" translate="label" type="select"
-                               showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+                        <field id="checkout_page_button_br_installment_period" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
                             <label>Brazil Installment Period</label>
                             <config_path>paypal/style/checkout_page_button_br_installment_period</config_path>
-                            <source_model>
-                                Magento\Paypal\Model\System\Config\Source\ButtonStyles::getBrInstallmentPeriod
-                            </source_model>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getBrInstallmentPeriod</source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                                 <field id="checkout_page_button_label">installment</field>
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>
-                        <field id="checkout_page_button_layout" translate="label" type="select" showInDefault="1"
-                               showInWebsite="1" showInStore="1" sortOrder="30">
+                        <field id="checkout_page_button_layout" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
                             <label>Layout</label>
                             <config_path>paypal/style/checkout_page_button_layout</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLayout
-                            </source_model>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLayout</source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                                 <field id="checkout_page_button_label" negative="1">credit</field>
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>
-                        <field id="checkout_page_button_shape" translate="label" type="select" showInDefault="1"
-                               showInWebsite="1" showInStore="1" sortOrder="50">
+                        <field id="checkout_page_button_shape" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
                             <label>Shape</label>
                             <config_path>paypal/style/checkout_page_button_shape</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getShape
-                            </source_model>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getShape</source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>
-                        <field id="checkout_page_button_color" translate="label" type="select" showInDefault="1"
-                               showInWebsite="1" showInStore="1" sortOrder="60">
+                        <field id="checkout_page_button_color" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
                             <label>Color</label>
                             <config_path>paypal/style/checkout_page_button_color</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getColor
-                            </source_model>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getColor</source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                                 <field id="checkout_page_button_label" negative="1">credit</field>
@@ -1418,53 +1215,45 @@
                             <attribute type="shared">1</attribute>
                         </field>
                     </group>
-                    <group id="product_page_button" translate="label comment" showInDefault="1" showInWebsite="1"
-                           showInStore="1" sortOrder="100">
+                    <group id="product_page_button" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
                         <label>Product Pages</label>
-                        <field id="product_page_button_customize"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
+                        <field id="product_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
                             <config_path>paypal/style/product_page_button_customize</config_path>
                         </field>
-                        <field id="product_page_button_label"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
+                        <field id="product_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
                             <config_path>paypal/style/product_page_button_label</config_path>
                             <depends>
                                 <field id="product_page_button_customize">1</field>
                             </depends>
                         </field>
-                        <field id="product_page_button_mx_installment_period"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
+                        <field id="product_page_button_mx_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
                             <config_path>paypal/style/product_page_button_mx_installment_period</config_path>
                             <depends>
                                 <field id="product_page_button_customize">1</field>
                                 <field id="product_page_button_label">installment</field>
                             </depends>
                         </field>
-                        <field id="product_page_button_br_installment_period"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
+                        <field id="product_page_button_br_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
                             <config_path>paypal/style/product_page_button_br_installment_period</config_path>
                             <depends>
                                 <field id="product_page_button_customize">1</field>
                                 <field id="product_page_button_label">installment</field>
                             </depends>
                         </field>
-                        <field id="product_page_button_layout"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
+                        <field id="product_page_button_layout" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
                             <config_path>paypal/style/product_page_button_layout</config_path>
                             <depends>
                                 <field id="product_page_button_customize">1</field>
                                 <field id="product_page_button_label" negative="1">credit</field>
                             </depends>
                         </field>
-                        <field id="product_page_button_shape"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
+                        <field id="product_page_button_shape" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
                             <config_path>paypal/style/product_page_button_shape</config_path>
                             <depends>
                                 <field id="product_page_button_customize">1</field>
                             </depends>
                         </field>
-                        <field id="product_page_button_color"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
+                        <field id="product_page_button_color" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
                             <config_path>paypal/style/product_page_button_color</config_path>
                             <depends>
                                 <field id="product_page_button_customize">1</field>
@@ -1472,53 +1261,45 @@
                             </depends>
                         </field>
                     </group>
-                    <group id="cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1"
-                           sortOrder="110">
+                    <group id="cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="110">
                         <label>Cart Page</label>
-                        <field id="cart_page_button_customize"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
+                        <field id="cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
                             <config_path>paypal/style/cart_page_button_customize</config_path>
                         </field>
-                        <field id="cart_page_button_label"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
+                        <field id="cart_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
                             <config_path>paypal/style/cart_page_button_label</config_path>
                             <depends>
                                 <field id="cart_page_button_customize">1</field>
                             </depends>
                         </field>
-                        <field id="cart_page_button_mx_installment_period"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
+                        <field id="cart_page_button_mx_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
                             <config_path>paypal/style/cart_page_button_mx_installment_period</config_path>
                             <depends>
                                 <field id="cart_page_button_customize">1</field>
                                 <field id="cart_page_button_label">installment</field>
                             </depends>
                         </field>
-                        <field id="cart_page_button_br_installment_period"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
+                        <field id="cart_page_button_br_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
                             <config_path>paypal/style/cart_page_button_br_installment_period</config_path>
                             <depends>
                                 <field id="cart_page_button_customize">1</field>
                                 <field id="cart_page_button_label">installment</field>
                             </depends>
                         </field>
-                        <field id="cart_page_button_layout"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
+                        <field id="cart_page_button_layout" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
                             <config_path>paypal/style/cart_page_button_layout</config_path>
                             <depends>
                                 <field id="cart_page_button_customize">1</field>
                                 <field id="cart_page_button_label" negative="1">credit</field>
                             </depends>
                         </field>
-                        <field id="cart_page_button_shape"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
+                        <field id="cart_page_button_shape" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
                             <config_path>paypal/style/cart_page_button_shape</config_path>
                             <depends>
                                 <field id="cart_page_button_customize">1</field>
                             </depends>
                         </field>
-                        <field id="cart_page_button_color"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
+                        <field id="cart_page_button_color" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
                             <config_path>paypal/style/cart_page_button_color</config_path>
                             <depends>
                                 <field id="cart_page_button_customize">1</field>
@@ -1526,53 +1307,45 @@
                             </depends>
                         </field>
                     </group>
-                    <group id="mini_cart_page_button" translate="label" showInDefault="1" showInWebsite="1"
-                           showInStore="1" sortOrder="120">
+                    <group id="mini_cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="120">
                         <label>Mini Cart</label>
-                        <field id="mini_cart_page_button_customize"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
+                        <field id="mini_cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
                             <config_path>paypal/style/mini_cart_page_button_customize</config_path>
                         </field>
-                        <field id="mini_cart_page_button_label"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
+                        <field id="mini_cart_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
                             <config_path>paypal/style/mini_cart_page_button_label</config_path>
                             <depends>
                                 <field id="mini_cart_page_button_customize">1</field>
                             </depends>
                         </field>
-                        <field id="mini_cart_page_button_mx_installment_period"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
+                        <field id="mini_cart_page_button_mx_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
                             <config_path>paypal/style/mini_cart_page_button_mx_installment_period</config_path>
                             <depends>
                                 <field id="mini_cart_page_button_customize">1</field>
                                 <field id="mini_cart_page_button_label">installment</field>
                             </depends>
                         </field>
-                        <field id="mini_cart_page_button_br_installment_period"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
+                        <field id="mini_cart_page_button_br_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
                             <config_path>paypal/style/mini_cart_page_button_br_installment_period</config_path>
                             <depends>
                                 <field id="mini_cart_page_button_customize">1</field>
                                 <field id="mini_cart_page_button_label">installment</field>
                             </depends>
                         </field>
-                        <field id="mini_cart_page_button_layout"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
+                        <field id="mini_cart_page_button_layout" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
                             <config_path>paypal/style/mini_cart_page_button_layout</config_path>
                             <depends>
                                 <field id="mini_cart_page_button_customize">1</field>
                                 <field id="mini_cart_page_button_label" negative="1">credit</field>
                             </depends>
                         </field>
-                        <field id="mini_cart_page_button_shape"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
+                        <field id="mini_cart_page_button_shape" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
                             <config_path>paypal/style/mini_cart_page_button_shape</config_path>
                             <depends>
                                 <field id="mini_cart_page_button_customize">1</field>
                             </depends>
                         </field>
-                        <field id="mini_cart_page_button_color"
-                               extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
+                        <field id="mini_cart_page_button_color" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
                             <config_path>paypal/style/mini_cart_page_button_color</config_path>
                             <depends>
                                 <field id="mini_cart_page_button_customize">1</field>
@@ -1580,11 +1353,9 @@
                             </depends>
                         </field>
                     </group>
-                    <group id="features" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1"
-                           sortOrder="130">
+                    <group id="features" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="130">
                         <label>Features</label>
-                        <field id="disable_funding_options" translate="label comment" type="multiselect" sortOrder="10"
-                               showInDefault="1" showInWebsite="1" showInStore="1">
+                        <field id="disable_funding_options" translate="label comment" type="multiselect" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                             <label>Disable Funding Options</label>
                             <comment>
                                 <![CDATA[PayPal will automatically display each enabled funding option to eligible buyers.
@@ -1592,9 +1363,7 @@
                                 offered and the currency offered by the merchant is USD.]]>
                             </comment>
                             <config_path>paypal/style/disable_funding_options</config_path>
-                            <frontend_model>
-                                Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect\DisabledFundingOptions
-                            </frontend_model>
+                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect\DisabledFundingOptions</frontend_model>
                             <source_model>Magento\Paypal\Model\System\Config\Source\DisableFundingOptions</source_model>
                             <attribute type="shared">1</attribute>
                             <can_be_empty>1</can_be_empty>

From 22573283f1fd2c758ff268979ad74c5924b14f76 Mon Sep 17 00:00:00 2001
From: glo5363 <glo05363@adobe.com>
Date: Thu, 30 Sep 2021 14:46:37 +0530
Subject: [PATCH 25/87] changes after automation for static tests

---
 app/code/Magento/Paypal/Model/Config.php | 5 -----
 app/code/Magento/Paypal/Model/SdkUrl.php | 2 --
 2 files changed, 7 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 47fc9e1f2b1a2..ce185150df745 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -179,7 +179,6 @@ class Config extends AbstractConfig
     const PAYLATER = 'paypal_paylater';
 
     /**
-     * Instructions for generating proper BN code
      *
      * @var array
      */
@@ -190,7 +189,6 @@ class Config extends AbstractConfig
     ];
 
     /**
-     * Style system config map (Express Checkout)
      *
      * @var array
      */
@@ -203,7 +201,6 @@ class Config extends AbstractConfig
     ];
 
     /**
-     * Currency codes supported by PayPal methods
      *
      * @var string[]
      */
@@ -233,7 +230,6 @@ class Config extends AbstractConfig
     ];
 
     /**
-     * Merchant country supported by PayPal
      *
      * @var string[]
      */
@@ -309,7 +305,6 @@ class Config extends AbstractConfig
     ];
 
     /**
-     * Buyer country supported by PayPal
      *
      * @var string[]
      */
diff --git a/app/code/Magento/Paypal/Model/SdkUrl.php b/app/code/Magento/Paypal/Model/SdkUrl.php
index 402e43ee0a471..bc4b9a27114ed 100644
--- a/app/code/Magento/Paypal/Model/SdkUrl.php
+++ b/app/code/Magento/Paypal/Model/SdkUrl.php
@@ -42,7 +42,6 @@ class SdkUrl
     private $queryParams = [];
 
     /**
-     * Maps the old checkout SDK configuration values to the current ones
      *
      * @var array
      */
@@ -61,7 +60,6 @@ class SdkUrl
     private $localeResolver;
 
     /**
-     * Generated Url to PayPAl SDK
      *
      * @var string
      */

From d014a677c63136ae6d5eaffcfc9b3bc460c23ee6 Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Thu, 30 Sep 2021 21:02:47 +0530
Subject: [PATCH 26/87] AC-1228::Fixed Automation Failed Tests

---
 .../Model/_files/expected_style_config.php    | 20 +++++++++++++++----
 .../frontend/web/js/in-context/paypal-sdk.js  |  7 ++++---
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_style_config.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_style_config.php
index 70da325434845..6f8867655948a 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_style_config.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_style_config.php
@@ -27,7 +27,10 @@
             ],
             'isVisibleOnProductPage' => false,
             'isGuestCheckoutAllowed' => true,
-            'sdkUrl' => 'http://mock.url'
+            'sdkUrl' => 'http://mock.url',
+            'dataAttributes' => [
+                'data-partner-attribution-id'   => 'BN_CODE'
+            ]
         ]
     ],
     'checkout' => [
@@ -51,7 +54,10 @@
             ],
             'isVisibleOnProductPage' => false,
             'isGuestCheckoutAllowed' => true,
-            'sdkUrl' => 'http://mock.url'
+            'sdkUrl' => 'http://mock.url',
+            'dataAttributes' => [
+                'data-partner-attribution-id'   => 'BN_CODE'
+            ]
         ]
     ],
     'mini_cart' => [
@@ -74,7 +80,10 @@
             ],
             'isVisibleOnProductPage' => false,
             'isGuestCheckoutAllowed' => true,
-            'sdkUrl' => 'http://mock.url'
+            'sdkUrl' => 'http://mock.url',
+            'dataAttributes' => [
+                'data-partner-attribution-id'   => 'BN_CODE'
+            ]
         ]
     ],
     'product' => [
@@ -97,7 +106,10 @@
             ],
             'isVisibleOnProductPage' => false,
             'isGuestCheckoutAllowed' => true,
-            'sdkUrl' => 'http://mock.url'
+            'sdkUrl' => 'http://mock.url',
+            'dataAttributes' => [
+                'data-partner-attribution-id'   => 'BN_CODE'
+            ]
         ]
     ],
 ];
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
index a8bb301b0a859..2eaf8dfa6cc50 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
@@ -13,7 +13,8 @@ define([
      * Loads the PayPal SDK object
      * @param {String} paypalUrl - the url of the PayPal SDK
      */
-    return function loadPaypalScript(paypalUrl, dataAttributes) {
+    return function loadPaypalScript(paypalUrl, dataAttributes)
+    {
         //configuration for loaded PayPal script
         require.config({
             paths: {
@@ -24,9 +25,9 @@ define([
                     exports: 'paypal'
                 }
             },
-            onNodeCreated: function(node, config, name, url){
+            onNodeCreated: function (node, config, name) {
                 $.each(dataAttributes, function (index, elem) {
-                    node.setAttribute( index, elem);
+                    node.setAttribute(index, elem);
                 });
             }
         });

From 1ee5567e4959746b77ec74329f91574227b2c31e Mon Sep 17 00:00:00 2001
From: Nishant Rana <glo04412@adobe.com>
Date: Fri, 1 Oct 2021 11:42:54 +0530
Subject: [PATCH 27/87] AC-1229: PayPal Add Venmo and changed button style to
 vertical

---
 app/code/Magento/Paypal/Model/SdkUrl.php    | 23 ++++++++++++++++++++-
 app/code/Magento/Paypal/etc/frontend/di.xml |  6 ++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/SdkUrl.php b/app/code/Magento/Paypal/Model/SdkUrl.php
index e10f4ce2e886b..bcf4709246185 100644
--- a/app/code/Magento/Paypal/Model/SdkUrl.php
+++ b/app/code/Magento/Paypal/Model/SdkUrl.php
@@ -55,6 +55,13 @@ class SdkUrl
      */
     private $unsupportedPaymentMethods;
 
+    /**
+     * These payment methods will be added as parameters to the SDK url to enable them.
+     *
+     * @var array
+     */
+    private $supportedPaymentMethods;
+
     /**
      * @var ResolverInterface
      */
@@ -74,6 +81,7 @@ class SdkUrl
      * @param StoreManagerInterface $storeManager
      * @param array $disallowedFundingMap
      * @param array $unsupportedPaymentMethods
+     * @param array $supportedPaymentMethods
      */
     public function __construct(
         ResolverInterface $localeResolver,
@@ -81,7 +89,8 @@ public function __construct(
         ScopeConfigInterface $scopeConfig,
         StoreManagerInterface $storeManager,
         $disallowedFundingMap = [],
-        $unsupportedPaymentMethods = []
+        $unsupportedPaymentMethods = [],
+        $supportedPaymentMethods = []
     ) {
         $this->localeResolver = $localeResolver;
         $this->config = $configFactory->create();
@@ -90,6 +99,7 @@ public function __construct(
         $this->storeManager = $storeManager;
         $this->disallowedFundingMap = $disallowedFundingMap;
         $this->unsupportedPaymentMethods = $unsupportedPaymentMethods;
+        $this->supportedPaymentMethods = $supportedPaymentMethods;
     }
 
     /**
@@ -116,6 +126,7 @@ public function getUrl(): string
                 $params['intent'] = $this->getIntent();
                 $params['merchant-id'] = $this->config->getValue('merchant_id');
                 $params['disable-funding'] = $this->getDisallowedFunding();
+                $params['enable-funding'] = $this->getAllowedFunding();
                 $params = array_replace($params, $this->queryParams);
             }
             $params['components'] = implode(',', $components);
@@ -198,6 +209,16 @@ private function getDisallowedFunding()
         return implode(',', $result);
     }
 
+    /**
+     * Returns allowed funding from configuration
+     *
+     * @return string
+     */
+    private function getAllowedFunding()
+    {
+        return implode(',', $this->supportedPaymentMethods);
+    }
+
     /**
      * Returns if is allowed PayPal Guest Checkout.
      *
diff --git a/app/code/Magento/Paypal/etc/frontend/di.xml b/app/code/Magento/Paypal/etc/frontend/di.xml
index 0c6741fdc439d..36062b897e638 100644
--- a/app/code/Magento/Paypal/etc/frontend/di.xml
+++ b/app/code/Magento/Paypal/etc/frontend/di.xml
@@ -151,7 +151,7 @@
                     <item name="label" xsi:type="string">paypal</item>
                 </item>
                 <item name="product" xsi:type="array">
-                    <item name="layout" xsi:type="string">horizontal</item>
+                    <item name="layout" xsi:type="string">vertical</item>
                     <item name="size" xsi:type="string">responsive</item>
                     <item name="color" xsi:type="string">gold</item>
                     <item name="shape" xsi:type="string">pill</item>
@@ -177,7 +177,6 @@
                 <item name="ELV" xsi:type="string">sepa</item>
             </argument>
             <argument name="unsupportedPaymentMethods" xsi:type="array">
-                <item name="venmo" xsi:type="string">venmo</item>
                 <item name="bancontact" xsi:type="string">bancontact</item>
                 <item name="eps" xsi:type="string">eps</item>
                 <item name="giropay" xsi:type="string">giropay</item>
@@ -186,6 +185,9 @@
                 <item name="p24" xsi:type="string">p24</item>
                 <item name="sofort" xsi:type="string">sofort</item>
             </argument>
+            <argument name="supportedPaymentMethods" xsi:type="array">
+                <item name="venmo" xsi:type="string">venmo</item>
+            </argument>
             <argument name="localeResolver" xsi:type="object">Magento\Paypal\Model\Express\LocaleResolver</argument>
         </arguments>
     </type>

From 7f1ee26b5e73031f5699d04c98faddbf9de2a7b9 Mon Sep 17 00:00:00 2001
From: Nishant Rana <glo04412@adobe.com>
Date: Fri, 1 Oct 2021 16:04:16 +0530
Subject: [PATCH 28/87] Code Sniffer issues fixes

---
 app/code/Magento/Paypal/Model/SdkUrl.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/SdkUrl.php b/app/code/Magento/Paypal/Model/SdkUrl.php
index bcf4709246185..9279058d76c9e 100644
--- a/app/code/Magento/Paypal/Model/SdkUrl.php
+++ b/app/code/Magento/Paypal/Model/SdkUrl.php
@@ -42,8 +42,6 @@ class SdkUrl
     private $queryParams = [];
 
     /**
-     * Maps the old checkout SDK configuration values to the current ones
-     *
      * @var array
      */
     private $disallowedFundingMap;
@@ -68,8 +66,6 @@ class SdkUrl
     private $localeResolver;
 
     /**
-     * Generated Url to PayPAl SDK
-     *
      * @var string
      */
     private $url;

From 17fd5915d23a1e2cd552bbd59a235cd7071df6b8 Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Fri, 1 Oct 2021 18:11:32 +0530
Subject: [PATCH 29/87] AC-1228::Fixed Automation Failed Static Tests

---
 .../Paypal/view/frontend/web/js/in-context/paypal-sdk.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
index 2eaf8dfa6cc50..b2fbf3b1055e5 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
@@ -12,9 +12,9 @@ define([
     /**
      * Loads the PayPal SDK object
      * @param {String} paypalUrl - the url of the PayPal SDK
+     * @param {Array} dataAttributes - Array of the Attributes for PayPal SDK Script tag
      */
-    return function loadPaypalScript(paypalUrl, dataAttributes)
-    {
+    return function loadPaypalScript(paypalUrl, dataAttributes) {
         //configuration for loaded PayPal script
         require.config({
             paths: {
@@ -25,7 +25,10 @@ define([
                     exports: 'paypal'
                 }
             },
-            onNodeCreated: function (node, config, name) {
+            /**
+             * Add attributes under Paypal SDK Script tag
+             */
+            onNodeCreated: function (node) {
                 $.each(dataAttributes, function (index, elem) {
                     node.setAttribute(index, elem);
                 });

From 37f1cdb50c8c9257831eedd397983aefdfbc03e4 Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Fri, 1 Oct 2021 20:54:23 +0530
Subject: [PATCH 30/87] AC-1228::Fixed Automation Failed ESLint Static Tests

---
 .../Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
index b2fbf3b1055e5..006be094319ce 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
@@ -25,6 +25,7 @@ define([
                     exports: 'paypal'
                 }
             },
+
             /**
              * Add attributes under Paypal SDK Script tag
              */

From 4d5d63c117131a8aa703ab8436579958294e2236 Mon Sep 17 00:00:00 2001
From: Nishant Rana <glo04412@adobe.com>
Date: Tue, 5 Oct 2021 13:14:19 +0530
Subject: [PATCH 31/87] AC-1230: PayPal Add PayLater and made PayLater option
 availale for all countries

---
 app/code/Magento/Paypal/Model/SdkUrl.php         | 12 ++++++++++--
 app/code/Magento/Paypal/etc/adminhtml/system.xml |  8 ++++----
 app/code/Magento/Paypal/etc/frontend/di.xml      |  1 +
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/SdkUrl.php b/app/code/Magento/Paypal/Model/SdkUrl.php
index 9279058d76c9e..5413d0f771406 100644
--- a/app/code/Magento/Paypal/Model/SdkUrl.php
+++ b/app/code/Magento/Paypal/Model/SdkUrl.php
@@ -206,13 +206,21 @@ private function getDisallowedFunding()
     }
 
     /**
-     * Returns allowed funding from configuration
+     * Returns allowed funding from configuration after validating
      *
      * @return string
      */
     private function getAllowedFunding()
     {
-        return implode(',', $this->supportedPaymentMethods);
+        $payLaterActive = (boolean)$this->config->getPayLaterConfigValue('experience_active');
+
+        // If Pay Later is enabled, then only paylater parameter will go in enable-funding parameter list
+        if ($payLaterActive == false) {
+            unset($this->supportedPaymentMethods['paylater']);
+            return implode(',', $this->supportedPaymentMethods);
+        } else {
+            return implode(',', $this->supportedPaymentMethods);
+        }
     }
 
     /**
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system.xml b/app/code/Magento/Paypal/etc/adminhtml/system.xml
index 6ae7090ebf007..db2890f04efdc 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system.xml
@@ -247,9 +247,9 @@
                 <group id="express_checkout_required">
                     <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
                     <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                    <field id="enable_paypal_paylater_experience" showInDefault="0" showInWebsite="0"/>
+                    <field id="enable_paypal_paylater_experience" showInDefault="1" showInWebsite="1"/>
                     <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                    <group id="advertise_paylater" showInDefault="0" showInWebsite="0"/>
+                    <group id="advertise_paylater" showInDefault="1" showInWebsite="1"/>
                 </group>
             </group>
             <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -279,9 +279,9 @@
                         </field>
                         <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
                         <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                        <field id="enable_paypal_paylater_experience" showInDefault="0" showInWebsite="0"/>
+                        <field id="enable_paypal_paylater_experience" showInDefault="1" showInWebsite="1"/>
                         <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                        <group id="advertise_paylater" showInDefault="0" showInWebsite="0"/>
+                        <group id="advertise_paylater" showInDefault="1" showInWebsite="1"/>
                     </group>
                     <group id="settings_ec">
                         <label>Basic Settings - PayPal Website Payments Standard</label>
diff --git a/app/code/Magento/Paypal/etc/frontend/di.xml b/app/code/Magento/Paypal/etc/frontend/di.xml
index 36062b897e638..4af05ea3fca51 100644
--- a/app/code/Magento/Paypal/etc/frontend/di.xml
+++ b/app/code/Magento/Paypal/etc/frontend/di.xml
@@ -187,6 +187,7 @@
             </argument>
             <argument name="supportedPaymentMethods" xsi:type="array">
                 <item name="venmo" xsi:type="string">venmo</item>
+                <item name="paylater" xsi:type="string">paylater</item>
             </argument>
             <argument name="localeResolver" xsi:type="object">Magento\Paypal\Model\Express\LocaleResolver</argument>
         </arguments>

From 2b8700c5c03ab488bbf726c974ac1a72fbd85d20 Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Thu, 14 Oct 2021 11:57:43 +0530
Subject: [PATCH 32/87] AC-1228::Fetch BN Code

---
 app/code/Magento/Paypal/Model/SmartButtonConfig.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/Model/SmartButtonConfig.php b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
index 0a06bcda2714d..8d51051242391 100644
--- a/app/code/Magento/Paypal/Model/SmartButtonConfig.php
+++ b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Paypal\Model\Payflowpro;
 
 /**
  * Provides configuration values for PayPal in-context checkout
@@ -43,11 +44,17 @@ class SmartButtonConfig
      */
     private $sdkUrl;
 
+    /**
+     * @var Payflowpro
+     */
+    private $payflowpro;
+
     /**
      * @param ResolverInterface $localeResolver
      * @param ConfigFactory $configFactory
      * @param ScopeConfigInterface $scopeConfig
      * @param SdkUrl $sdkUrl
+     * @param Payflowpro $payflowpro
      * @param array $defaultStyles
      */
     public function __construct(
@@ -55,6 +62,7 @@ public function __construct(
         ConfigFactory $configFactory,
         ScopeConfigInterface $scopeConfig,
         SdkUrl $sdkUrl,
+        Payflowpro $payflowpro,
         $defaultStyles = []
     ) {
         $this->localeResolver = $localeResolver;
@@ -63,6 +71,7 @@ public function __construct(
         $this->scopeConfig = $scopeConfig;
         $this->defaultStyles = $defaultStyles;
         $this->sdkUrl = $sdkUrl;
+        $this->payflowpro = $payflowpro;
     }
 
     /**
@@ -77,13 +86,15 @@ public function getConfig(string $page): array
             Data::XML_PATH_GUEST_CHECKOUT,
             ScopeInterface::SCOPE_STORE
         );
+        $config = $this->payflowpro->getConfig();
         return [
             'styles' => $this->getButtonStyles($page),
             'isVisibleOnProductPage'  => (bool)$this->config->getValue('visible_on_product'),
             'isGuestCheckoutAllowed'  => $isGuestCheckoutAllowed,
             'sdkUrl' => $this->sdkUrl->getUrl(),
             'dataAttributes' => [
-                'data-partner-attribution-id'   => 'BN_CODE'
+                'data-partner-attribution-id'   => $config->getBuildNotationCode() != '' ?
+                    $config->getBuildNotationCode() : ''
             ]
         ];
     }

From 02571fceaabcec4a0b5c8037a20e03c3853f013b Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Thu, 14 Oct 2021 16:43:12 +0530
Subject: [PATCH 33/87] AC-1228::Fixed Failed Test

---
 .../Test/Unit/Model/_files/expected_style_config.php      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_style_config.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_style_config.php
index 6f8867655948a..5b8b47dd65c5b 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_style_config.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_style_config.php
@@ -29,7 +29,7 @@
             'isGuestCheckoutAllowed' => true,
             'sdkUrl' => 'http://mock.url',
             'dataAttributes' => [
-                'data-partner-attribution-id'   => 'BN_CODE'
+                'data-partner-attribution-id'   => 'Magento_2_%s'
             ]
         ]
     ],
@@ -56,7 +56,7 @@
             'isGuestCheckoutAllowed' => true,
             'sdkUrl' => 'http://mock.url',
             'dataAttributes' => [
-                'data-partner-attribution-id'   => 'BN_CODE'
+                'data-partner-attribution-id'   => 'Magento_2_%s'
             ]
         ]
     ],
@@ -82,7 +82,7 @@
             'isGuestCheckoutAllowed' => true,
             'sdkUrl' => 'http://mock.url',
             'dataAttributes' => [
-                'data-partner-attribution-id'   => 'BN_CODE'
+                'data-partner-attribution-id'   => 'Magento_2_%s'
             ]
         ]
     ],
@@ -108,7 +108,7 @@
             'isGuestCheckoutAllowed' => true,
             'sdkUrl' => 'http://mock.url',
             'dataAttributes' => [
-                'data-partner-attribution-id'   => 'BN_CODE'
+                'data-partner-attribution-id'   => 'Magento_2_%s'
             ]
         ]
     ],

From 4aab397b15de4f6d975ad0f4fa3908865f7ceab4 Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Mon, 18 Oct 2021 15:58:14 +0530
Subject: [PATCH 34/87] AC-1228::Fixed Automation Test Issue

---
 app/code/Magento/Paypal/Model/SmartButtonConfig.php   |  2 +-
 .../Paypal/Test/Unit/Model/SmartButtonConfigTest.php  | 11 +++++++++++
 .../Test/Unit/Model/_files/expected_style_config.php  |  8 ++++----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/SmartButtonConfig.php b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
index 8d51051242391..b567b7e3307f1 100644
--- a/app/code/Magento/Paypal/Model/SmartButtonConfig.php
+++ b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
@@ -93,7 +93,7 @@ public function getConfig(string $page): array
             'isGuestCheckoutAllowed'  => $isGuestCheckoutAllowed,
             'sdkUrl' => $this->sdkUrl->getUrl(),
             'dataAttributes' => [
-                'data-partner-attribution-id'   => $config->getBuildNotationCode() != '' ?
+                'data-partner-attribution-id' => $config->getBuildNotationCode() != '' ?
                     $config->getBuildNotationCode() : ''
             ]
         ];
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
index e42865fa138c3..1e1bd8e0a66a2 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
@@ -16,6 +16,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Paypal\Model\Payflowpro;
 
 /**
  * Test for smart button config
@@ -37,6 +38,11 @@ class SmartButtonConfigTest extends TestCase
      */
     private $configMock;
 
+    /**
+     * @var Payflowpro
+     */
+    private $payflowpro;
+
     /**
      * @inheritDoc
      */
@@ -47,6 +53,9 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->payflowproMock = $this->getMockBuilder(Payflowpro::class)
+            ->getMock();
+
         /** @var ScopeConfigInterface|MockObject $scopeConfigMock */
         $scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $scopeConfigMock->method('isSetFlag')
@@ -68,6 +77,7 @@ protected function setUp(): void
             $scopeConfigMock,
             $sdkUrl,
             $this->getDefaultStyles(),
+            $this->payflowproMock
         );
     }
 
@@ -116,6 +126,7 @@ public function testGetConfig(
         );
 
         self::assertEquals($expected, $this->model->getConfig($page));
+
     }
 
     /**
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_style_config.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_style_config.php
index 5b8b47dd65c5b..f80ee8f919dd1 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_style_config.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_style_config.php
@@ -29,7 +29,7 @@
             'isGuestCheckoutAllowed' => true,
             'sdkUrl' => 'http://mock.url',
             'dataAttributes' => [
-                'data-partner-attribution-id'   => 'Magento_2_%s'
+                'data-partner-attribution-id' => 'Magento_2_%s'
             ]
         ]
     ],
@@ -56,7 +56,7 @@
             'isGuestCheckoutAllowed' => true,
             'sdkUrl' => 'http://mock.url',
             'dataAttributes' => [
-                'data-partner-attribution-id'   => 'Magento_2_%s'
+                'data-partner-attribution-id' => 'Magento_2_%s'
             ]
         ]
     ],
@@ -82,7 +82,7 @@
             'isGuestCheckoutAllowed' => true,
             'sdkUrl' => 'http://mock.url',
             'dataAttributes' => [
-                'data-partner-attribution-id'   => 'Magento_2_%s'
+                'data-partner-attribution-id' => 'Magento_2_%s'
             ]
         ]
     ],
@@ -108,7 +108,7 @@
             'isGuestCheckoutAllowed' => true,
             'sdkUrl' => 'http://mock.url',
             'dataAttributes' => [
-                'data-partner-attribution-id'   => 'Magento_2_%s'
+                'data-partner-attribution-id' => 'Magento_2_%s'
             ]
         ]
     ],

From da540e83df26e5106df97aa4487035922f0dfe17 Mon Sep 17 00:00:00 2001
From: Nishant Rana <glo04412@adobe.com>
Date: Tue, 19 Oct 2021 10:57:40 +0530
Subject: [PATCH 35/87] Added return type string

---
 app/code/Magento/Paypal/Model/SdkUrl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/Model/SdkUrl.php b/app/code/Magento/Paypal/Model/SdkUrl.php
index 5413d0f771406..44caa50947c94 100644
--- a/app/code/Magento/Paypal/Model/SdkUrl.php
+++ b/app/code/Magento/Paypal/Model/SdkUrl.php
@@ -210,7 +210,7 @@ private function getDisallowedFunding()
      *
      * @return string
      */
-    private function getAllowedFunding()
+    private function getAllowedFunding(): string
     {
         $payLaterActive = (boolean)$this->config->getPayLaterConfigValue('experience_active');
 

From a9b69a7545d4e774d1faef3bc3293d6ec9b4392f Mon Sep 17 00:00:00 2001
From: Nishant Rana <glo04412@adobe.com>
Date: Wed, 20 Oct 2021 12:30:07 +0530
Subject: [PATCH 36/87] Made code improvements as suggested

---
 app/code/Magento/Paypal/Model/SdkUrl.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/SdkUrl.php b/app/code/Magento/Paypal/Model/SdkUrl.php
index 44caa50947c94..6a430cab41c90 100644
--- a/app/code/Magento/Paypal/Model/SdkUrl.php
+++ b/app/code/Magento/Paypal/Model/SdkUrl.php
@@ -217,10 +217,8 @@ private function getAllowedFunding(): string
         // If Pay Later is enabled, then only paylater parameter will go in enable-funding parameter list
         if ($payLaterActive == false) {
             unset($this->supportedPaymentMethods['paylater']);
-            return implode(',', $this->supportedPaymentMethods);
-        } else {
-            return implode(',', $this->supportedPaymentMethods);
         }
+        return implode(',', $this->supportedPaymentMethods);
     }
 
     /**

From 72e9570e565db43b4c3cc22c7d8091ffde61a21f Mon Sep 17 00:00:00 2001
From: Lavi Jain <87003041+glo05363@users.noreply.github.com>
Date: Wed, 20 Oct 2021 20:48:56 +0530
Subject: [PATCH 37/87] Return Type Added

---
 app/code/Magento/Paypal/Model/SdkUrl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/Model/SdkUrl.php b/app/code/Magento/Paypal/Model/SdkUrl.php
index bc4b9a27114ed..97b98419d5c2b 100644
--- a/app/code/Magento/Paypal/Model/SdkUrl.php
+++ b/app/code/Magento/Paypal/Model/SdkUrl.php
@@ -175,7 +175,7 @@ private function getClientId()
      *
      * @return string
      */
-    private function getBuyerCountry()
+    private function getBuyerCountry(): string
     {
         return (int)$this->config->getValue('sandbox_flag') ?
             $this->config->getValue('buyer_country') :

From 6dce95e62183cfccdf8ae186ca3efbd88f9f6c42 Mon Sep 17 00:00:00 2001
From: Nishant Rana <glo04412@adobe.com>
Date: Thu, 21 Oct 2021 10:04:25 +0530
Subject: [PATCH 38/87] Changed to bool and strict comparison done

---
 app/code/Magento/Paypal/Model/SdkUrl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/SdkUrl.php b/app/code/Magento/Paypal/Model/SdkUrl.php
index 6a430cab41c90..f7e92985db2ee 100644
--- a/app/code/Magento/Paypal/Model/SdkUrl.php
+++ b/app/code/Magento/Paypal/Model/SdkUrl.php
@@ -212,10 +212,10 @@ private function getDisallowedFunding()
      */
     private function getAllowedFunding(): string
     {
-        $payLaterActive = (boolean)$this->config->getPayLaterConfigValue('experience_active');
+        $payLaterActive = (bool)$this->config->getPayLaterConfigValue('experience_active');
 
         // If Pay Later is enabled, then only paylater parameter will go in enable-funding parameter list
-        if ($payLaterActive == false) {
+        if ($payLaterActive === false) {
             unset($this->supportedPaymentMethods['paylater']);
         }
         return implode(',', $this->supportedPaymentMethods);

From f3e9ece1a4b77ea841ee661761da7de4bc9b68f8 Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Thu, 21 Oct 2021 20:01:31 +0530
Subject: [PATCH 39/87] AC-1228::Fixed Unit Test Issue

---
 app/code/Magento/Paypal/Model/SmartButtonConfig.php  |  3 +--
 .../Paypal/Test/Unit/Model/SmartButtonConfigTest.php | 12 +++++-------
 .../Test/Unit/Model/_files/expected_style_config.php |  8 ++++----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/SmartButtonConfig.php b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
index b567b7e3307f1..9deeacccb7fca 100644
--- a/app/code/Magento/Paypal/Model/SmartButtonConfig.php
+++ b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
@@ -93,8 +93,7 @@ public function getConfig(string $page): array
             'isGuestCheckoutAllowed'  => $isGuestCheckoutAllowed,
             'sdkUrl' => $this->sdkUrl->getUrl(),
             'dataAttributes' => [
-                'data-partner-attribution-id' => $config->getBuildNotationCode() != '' ?
-                    $config->getBuildNotationCode() : ''
+                'data-partner-attribution-id' => ($config) ? $config->getBuildNotationCode() : ''
             ]
         ];
     }
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
index 1e1bd8e0a66a2..8f66e3c0606d7 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
@@ -48,13 +48,11 @@ class SmartButtonConfigTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->localeResolverMock = $this->getMockForAbstractClass(ResolverInterface::class);
-        $this->configMock = $this->getMockBuilder(Config::class)
+        $this->localeResolverMock   = $this->getMockForAbstractClass(ResolverInterface::class);
+        $this->configMock           = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
-
-        $this->payflowproMock = $this->getMockBuilder(Payflowpro::class)
-            ->getMock();
+        $this->payflowproMock       = $this->createMock(Payflowpro::class);
 
         /** @var ScopeConfigInterface|MockObject $scopeConfigMock */
         $scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
@@ -76,8 +74,8 @@ protected function setUp(): void
             $configFactoryMock,
             $scopeConfigMock,
             $sdkUrl,
-            $this->getDefaultStyles(),
-            $this->payflowproMock
+            $this->payflowproMock,
+            $this->getDefaultStyles()
         );
     }
 
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_style_config.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_style_config.php
index f80ee8f919dd1..8c553a27b2613 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_style_config.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_style_config.php
@@ -29,7 +29,7 @@
             'isGuestCheckoutAllowed' => true,
             'sdkUrl' => 'http://mock.url',
             'dataAttributes' => [
-                'data-partner-attribution-id' => 'Magento_2_%s'
+                'data-partner-attribution-id' => ''
             ]
         ]
     ],
@@ -56,7 +56,7 @@
             'isGuestCheckoutAllowed' => true,
             'sdkUrl' => 'http://mock.url',
             'dataAttributes' => [
-                'data-partner-attribution-id' => 'Magento_2_%s'
+                'data-partner-attribution-id' => ''
             ]
         ]
     ],
@@ -82,7 +82,7 @@
             'isGuestCheckoutAllowed' => true,
             'sdkUrl' => 'http://mock.url',
             'dataAttributes' => [
-                'data-partner-attribution-id' => 'Magento_2_%s'
+                'data-partner-attribution-id' => ''
             ]
         ]
     ],
@@ -108,7 +108,7 @@
             'isGuestCheckoutAllowed' => true,
             'sdkUrl' => 'http://mock.url',
             'dataAttributes' => [
-                'data-partner-attribution-id' => 'Magento_2_%s'
+                'data-partner-attribution-id' => ''
             ]
         ]
     ],

From 70bcc5ba953e544cd3750cd3d946e4c4a5032d8b Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Fri, 22 Oct 2021 16:30:50 +0530
Subject: [PATCH 40/87] AC-1228::Fixed Unit Test Issue

---
 .../Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
index 8f66e3c0606d7..d8cdcbf595642 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
@@ -39,9 +39,9 @@ class SmartButtonConfigTest extends TestCase
     private $configMock;
 
     /**
-     * @var Payflowpro
+     * @var MockObject
      */
-    private $payflowpro;
+    private $payflowproMock;
 
     /**
      * @inheritDoc
@@ -124,7 +124,6 @@ public function testGetConfig(
         );
 
         self::assertEquals($expected, $this->model->getConfig($page));
-
     }
 
     /**

From 4abeea35a55f2dc7e39ad7f81f97937cd45608e1 Mon Sep 17 00:00:00 2001
From: Aparna Sreekumar <glo80326@adobe.com>
Date: Fri, 22 Oct 2021 16:46:31 +0530
Subject: [PATCH 41/87] BUG#AC-1274: Customer Address Edit Buttons accesibility
 issue fixed

---
 .../view/adminhtml/web/template/default-address.html        | 2 +-
 .../Customer/view/base/ui_component/customer_form.xml       | 6 ++++++
 .../Magento/Ui/view/base/web/js/form/components/button.js   | 4 +++-
 .../Ui/view/base/web/templates/form/element/button.html     | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html b/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html
index 9b8cff43cc3e2..e6fb2b50e3d77 100644
--- a/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html
+++ b/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html
@@ -7,7 +7,7 @@
 <div data-bind="attr: {class: contentClass}">
     <div data-bind="attr: {class: 'fieldset-wrapper address-information ' + defaultAddressClass}">
         <address>
-            <div class="address_caption">
+            <div class="address_caption" data-bind="attr: {id: defaultAddressId}">
                 <text args="title"></text>
                 <each args="data: elems, as: 'element'">
                     <render if="hasTemplate()"></render>
diff --git a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
index 8898ce1ee3575..0a9df3016df0b 100644
--- a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
+++ b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
@@ -348,6 +348,7 @@
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="defaultAddressClass" xsi:type="string">billing-address</item>
+                        <item name="defaultAddressId" xsi:type="string">billing-address-caption</item>
                         <item name="title" translate="true" xsi:type="string">Default Billing Address</item>
                         <item name="contentClass" xsi:type="string">customer-default-billing-address-content</item>
                         <item name="notExistsMessage" xsi:type="string" translate="true">The customer does not have default billing address</item>
@@ -366,6 +367,8 @@
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="buttonClasses" xsi:type="string">edit-default-billing-address-button</item>
+                        <item name="buttonTextId" xsi:type="string">edit-billing-address</item>
+                        <item name="ariLabelledby" xsi:type="string">billing-address-caption edit-billing-address</item>
                         <item name="actions" xsi:type="array">
                             <item name="0" xsi:type="array">
                                 <item name="targetName" xsi:type="string">customer_form.areas.address.address.customer_address_update_modal.update_customer_address_form_loader</item>
@@ -398,6 +401,7 @@
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="defaultAddressClass" xsi:type="string">shipping-address</item>
+                        <item name="defaultAddressId" xsi:type="string">shipping-address-caption</item>
                         <item name="title" xsi:type="string" translate="true">Default Shipping Address</item>
                         <item name="contentClass" xsi:type="string">customer-default-shipping-address-content</item>
                         <item name="notExistsMessage" xsi:type="string" translate="true">The customer does not have default shipping address</item>
@@ -416,6 +420,8 @@
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="buttonClasses" xsi:type="string">edit-default-shipping-address-button</item>
+                        <item name="buttonTextId" xsi:type="string">edit-shipping-address</item>
+                        <item name="ariLabelledby" xsi:type="string">shipping-address-caption edit-shipping-address</item>
                         <item name="actions" xsi:type="array">
                             <item name="0" xsi:type="array">
                                 <item name="targetName" xsi:type="string">customer_form.areas.address.address.customer_address_update_modal.update_customer_address_form_loader</item>
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/button.js b/app/code/Magento/Ui/view/base/web/js/form/components/button.js
index bfc2eb2b8852b..415cb39137197 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/button.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/button.js
@@ -25,7 +25,9 @@ define([
             template: 'ui/form/components/button/simple',
             visible: true,
             disabled: false,
-            title: ''
+            title: '',
+            buttonTextId: '',
+            ariLabelledby: '',
         },
 
         /**
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/button.html b/app/code/Magento/Ui/view/base/web/templates/form/element/button.html
index 8ac44d98ab501..594a765d7cf4d 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/button.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/button.html
@@ -8,8 +8,8 @@
         css="buttonClasses"
         click="action"
         disable="disabled"
-        attr="'data-index': index">
-    <span text="title"></span>
+        attr="'data-index': index, 'aria-labelledby': ariLabelledby">
+    <span attr="'id': buttonTextId" text="title"></span>
 </button>
 
 <if args="childError">

From b25db3e40f7dd2102c42ff4a5134c0e1ed952c63 Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Fri, 22 Oct 2021 12:04:43 -0500
Subject: [PATCH 42/87] Allow configure Magento with env

---
 .../Framework/App/DeploymentConfig.php        | 45 ++++++++++++++++---
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig.php
index 6aeec2c2d0192..b3ddd3de94408 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig.php
@@ -19,6 +19,9 @@
  */
 class DeploymentConfig
 {
+    private const MAGENTO_ENV_PREFIX = 'MAGENTO_DC_';
+    private const ENV_NAME_PATTERN = '~^%env\(\s*(?<name>\w+)\s*(,\s*"(?<default>[^"]+)")?\)%$~';
+
     /**
      * Configuration reader
      *
@@ -140,6 +143,21 @@ public function isDbAvailable()
         return isset($this->data['db']);
     }
 
+    /**
+     * Get additional configuration from env variable MAGENTO_DC__OVERRIDE
+     * Data should be JSON encoded
+     *
+     * @return array
+     */
+    private function getEnvOverride() : array
+    {
+        $env = getenv(self::MAGENTO_ENV_PREFIX . '_OVERRIDE');
+        if (!empty($env)) {
+            return json_decode($env, true) ?? [];
+        }
+        return [];
+    }
+
     /**
      * Loads the configuration data
      *
@@ -150,10 +168,11 @@ public function isDbAvailable()
     private function load()
     {
         if (empty($this->data)) {
-            $this->data = $this->reader->load();
-            if ($this->overrideData) {
-                $this->data = array_replace($this->data, $this->overrideData);
-            }
+            $this->data = array_replace(
+                $this->reader->load(),
+                $this->overrideData ?? [],
+                $this->getEnvOverride()
+            );
             // flatten data for config retrieval using get()
             $this->flatData = $this->flattenParams($this->data);
         }
@@ -187,9 +206,25 @@ private function flattenParams(array $params, $path = null, array &$flattenResul
                 //phpcs:ignore Magento2.Exceptions.DirectThrow
                 throw new RuntimeException(new Phrase("Key collision '%1' is already defined.", [$newPath]));
             }
-            $flattenResult[$newPath] = $param;
+
             if (is_array($param)) {
+                $flattenResult[$newPath] = $param;
                 $this->flattenParams($param, $newPath, $flattenResult);
+            } else  {
+                // allow reading values from env variables
+                // value need to be specified in %env(NAME, "default value")% format
+                // like %env(DB_PASSWORD)%, %env(DB_NAME, "test")%
+                if (preg_match(self::ENV_NAME_PATTERN, $param,$matches)) {
+                    $param = getenv($matches['name']) ?: ($matches['default'] ?? null);
+                }
+
+                // allow reading values from env variables by convention
+                // MAGENTO_DC_{path}, like db/connection/default/host =>
+                // can be overwritten by MAGENTO_DC_DB__CONNECTION__DEFAULT__HOST
+                $envName = self::MAGENTO_ENV_PREFIX . strtoupper(str_replace(['/'], ['__'], $newPath));
+                $param = getenv($envName) ?: $param;
+
+                $flattenResult[$newPath] = $param;
             }
         }
 

From 11ba1d3646f5c98bf52e6a6d364413749cbf34ac Mon Sep 17 00:00:00 2001
From: Aparna Sreekumar <glo80326@adobe.com>
Date: Mon, 25 Oct 2021 09:49:46 +0530
Subject: [PATCH 43/87] BUG#AC-1274: Customer Address Edit Buttons accesibility
 issue fixed

---
 app/code/Magento/Ui/view/base/web/js/form/components/button.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/button.js b/app/code/Magento/Ui/view/base/web/js/form/components/button.js
index 415cb39137197..f2a8176fb250c 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/button.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/button.js
@@ -27,7 +27,7 @@ define([
             disabled: false,
             title: '',
             buttonTextId: '',
-            ariLabelledby: '',
+            ariLabelledby: ''
         },
 
         /**

From c3d83f83936be7adac0a99bf7ac529e519edebc3 Mon Sep 17 00:00:00 2001
From: abhattGlo <glo36217@adobe.com>
Date: Mon, 25 Oct 2021 18:50:17 +0530
Subject: [PATCH 44/87] AC-1282::Fixed label on date input

---
 .../Magento/Ui/view/base/web/templates/form/element/date.html  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/date.html b/app/code/Magento/Ui/view/base/web/templates/form/element/date.html
index aca560a07a26f..e0e203faf077d 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/date.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/date.html
@@ -13,5 +13,6 @@
         name: inputName,
         placeholder: placeholder,
         'aria-describedby': noticeId,
-        disabled: disabled
+        disabled: disabled,
+        id:uid
     }" />

From 09a6147e27aee8ea48b5ba435bcefffc21d7bafd Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Mon, 25 Oct 2021 19:12:33 -0500
Subject: [PATCH 45/87] Allow configure Magento with env

---
 lib/internal/Magento/Framework/App/DeploymentConfig.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig.php
index b3ddd3de94408..4aaabc8036c64 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig.php
@@ -152,10 +152,7 @@ public function isDbAvailable()
     private function getEnvOverride() : array
     {
         $env = getenv(self::MAGENTO_ENV_PREFIX . '_OVERRIDE');
-        if (!empty($env)) {
-            return json_decode($env, true) ?? [];
-        }
-        return [];
+        return !empty($env) ? (json_decode($env, true) ?? []) : [];
     }
 
     /**
@@ -214,7 +211,7 @@ private function flattenParams(array $params, $path = null, array &$flattenResul
                 // allow reading values from env variables
                 // value need to be specified in %env(NAME, "default value")% format
                 // like %env(DB_PASSWORD)%, %env(DB_NAME, "test")%
-                if (preg_match(self::ENV_NAME_PATTERN, $param,$matches)) {
+                if (preg_match(self::ENV_NAME_PATTERN, $param, $matches)) {
                     $param = getenv($matches['name']) ?: ($matches['default'] ?? null);
                 }
 

From 0ca49edca79a2d4ad8804176845da24d44ed3ffa Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Tue, 26 Oct 2021 19:10:29 +0530
Subject: [PATCH 46/87] AC-1222::Paypal Admin: PayLater -> Pay Later

---
 .../Paypal/etc/adminhtml/system/payflow_advanced.xml      | 2 +-
 .../Magento/Paypal/etc/adminhtml/system/payflow_link.xml  | 2 +-
 .../etc/adminhtml/system/payments_pro_hosted_solution.xml | 2 +-
 app/code/Magento/Paypal/i18n/en_US.csv                    | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
index ad5cf316a7a5b..7fec06253797d 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
@@ -217,7 +217,7 @@
                 </group>
             </group>
             <group id="advanced_advertise_paylater" translate="label" showInDefault="1" showInWebsite="1" sortOrder="70">
-                <label>Advertise PayPal PayLater</label>
+                <label>Advertise PayPal Pay Later</label>
                 <depends>
                     <field id="enable_paypal_paylater_experience">1</field>
                 </depends>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
index bde6ac8f0c022..f8348a85d0e67 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
@@ -226,7 +226,7 @@
                 </group>
             </group>
             <group id="payflow_link_advertise_paylater"  translate="label" showInDefault="1" showInWebsite="1" sortOrder="60">
-                <label>Advertise PayPal PayLater</label>
+                <label>Advertise PayPal Pay Later</label>
                 <field id="paylater_enabled" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/paylater_enabled" />
                 <depends>
                     <field id="enable_paypal_paylater_experience">1</field>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
index c36a1c1a53415..e7337566cac13 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
@@ -154,7 +154,7 @@
                 </group>
             </group>
             <group id="pphs_advertise_paylater"  translate="label" showInDefault="1" showInWebsite="1" sortOrder="60">
-                <label>Advertise PayPal PayLater</label>
+                <label>Advertise PayPal Pay Later</label>
                 <field id="paylater_enabled" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/paylater_enabled" />
                 <depends>
                     <field id="enable_paypal_paylater_experience">1</field>
diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
index ba80baf49b7bf..9495a0d4b964b 100644
--- a/app/code/Magento/Paypal/i18n/en_US.csv
+++ b/app/code/Magento/Paypal/i18n/en_US.csv
@@ -738,8 +738,8 @@ User,User
 "Order is suspended as an account verification transaction is suspected to be fraudulent.","Order is suspended as an account verification transaction is suspected to be fraudulent."
 "Payment can't be accepted since transaction was rejected by merchant.","Payment can't be accepted since transaction was rejected by merchant."
 "A successful payment transaction has already been completed. Please, check if the order has been placed.","A successful payment transaction has already been completed. Please, check if the order has been placed."
-"Advertise PayPal PayLater","Advertise PayPal PayLater"
-"Enable PayPal PayLater","Enable PayPal PayLater"
+"Advertise PayPal Pay Later","Advertise PayPal Pay Later"
+"Enable PayPal Pay Later","Enable PayPal Pay Later"
 "Style Layout","Style Layout"
 "Logo Type","Logo Type"
 "Logo Position","Logo Position"
@@ -759,8 +759,8 @@ User,User
 "Text","Text"
 "Flex","Flex"
 "Display pay later messaging on your site for offers like Pay in 3, which lets customers pay with 3 interest- free monthly payments. We’ll show messages on your site to promote this feature for you. You may not promote pay later offers with any other content, marketing, or materials","Display pay later messaging on your site for offers like Pay in 3, which lets customers pay with 3 interest- free monthly payments. We’ll show messages on your site to promote this feature for you. You may not promote pay later offers with any other content, marketing, or materials"
-"Enable PayPal PayLater Experience","Enable PayPal PayLater Experience"
-"Recommended. <strong>Advertise PayPal Credit</strong> is deprecated. See PayPal PayLater details and list of supported regions <a href="https://developer.paypal.com/docs/business/pay-later/us/#eligibility" target="_blank">here</a>.","Recommended. <strong>Advertise PayPal Credit</strong> is deprecated. See PayPal PayLater details and list of supported regions <a href="https://developer.paypal.com/docs/business/pay-later/us/#eligibility" target="_blank">here</a>.Recommended. <strong>Advertise PayPal Credit</strong> is deprecated. See PayPal PayLater details and list of supported regions <a href="https://developer.paypal.com/docs/business/pay-later/us/#eligibility" target="_blank">here</a>."
+"Enable PayPal Pay Later Experience","Enable PayPal Pay Later Experience"
+"Recommended. <strong>Advertise PayPal Credit</strong> is deprecated. See PayPal Pay Later details and list of supported regions <a href="https://developer.paypal.com/docs/business/pay-later/us/#eligibility" target="_blank">here</a>.","Recommended. <strong>Advertise PayPal Credit</strong> is deprecated. See PayPal Pay Later details and list of supported regions <a href="https://developer.paypal.com/docs/business/pay-later/us/#eligibility" target="_blank">here</a>.Recommended. <strong>Advertise PayPal Credit</strong> is deprecated. See PayPal Pay Later details and list of supported regions <a href="https://developer.paypal.com/docs/business/pay-later/us/#eligibility" target="_blank">here</a>."
 "Monochrome","Monochrome"
 "Grayscale","Grayscale"
 "Sidebar","Sidebar"

From 76a95e7c0b33d271fe133b7db874443fd11fb8e0 Mon Sep 17 00:00:00 2001
From: Nishant Rana <glo04412@adobe.com>
Date: Fri, 29 Oct 2021 10:38:45 +0530
Subject: [PATCH 47/87] Added venmo,paylater for all paypal payment methods

---
 app/code/Magento/Paypal/Model/SdkUrl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/SdkUrl.php b/app/code/Magento/Paypal/Model/SdkUrl.php
index f7e92985db2ee..7a6af6e01fc84 100644
--- a/app/code/Magento/Paypal/Model/SdkUrl.php
+++ b/app/code/Magento/Paypal/Model/SdkUrl.php
@@ -111,6 +111,7 @@ public function getUrl(): string
                 'client-id' => $this->getClientId(),
                 'locale' => $this->localeResolver->getLocale(),
                 'currency' => $this->storeManager->getStore()->getBaseCurrencyCode(),
+                'enable-funding' => $this->getAllowedFunding()
             ];
 
             if ($this->areMessagesEnabled()) {
@@ -122,7 +123,6 @@ public function getUrl(): string
                 $params['intent'] = $this->getIntent();
                 $params['merchant-id'] = $this->config->getValue('merchant_id');
                 $params['disable-funding'] = $this->getDisallowedFunding();
-                $params['enable-funding'] = $this->getAllowedFunding();
                 $params = array_replace($params, $this->queryParams);
             }
             $params['components'] = implode(',', $components);
@@ -214,7 +214,7 @@ private function getAllowedFunding(): string
     {
         $payLaterActive = (bool)$this->config->getPayLaterConfigValue('experience_active');
 
-        // If Pay Later is enabled, then only paylater parameter will go in enable-funding parameter list
+        // If Pay Later is disabled, paylater parameter will be removed from enable-funding parameter list
         if ($payLaterActive === false) {
             unset($this->supportedPaymentMethods['paylater']);
         }

From 6353aa0af12bf03a113e745d53f03b8550771cee Mon Sep 17 00:00:00 2001
From: abhattGlo <glo36217@adobe.com>
Date: Fri, 29 Oct 2021 13:46:16 +0530
Subject: [PATCH 48/87] AC-1229:: Unit Test added for venmo and paylater

---
 .../Paypal/Test/Unit/Model/SdkUrlTest.php     | 25 ++++++++++++++++---
 .../Unit/Model/_files/expected_url_config.php | 13 ++++++----
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php b/app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php
index 3b29017f494c4..3ba15b9e9f281 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php
@@ -11,7 +11,6 @@
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Paypal\Model\Config;
 use Magento\Paypal\Model\ConfigFactory;
-use Magento\Paypal\Model\SmartButtonConfig;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -75,7 +74,8 @@ protected function setUp(): void
             $scopeConfigMock,
             $storeManagerMock,
             $this->getDisallowedFundingMap(),
-            $this->getUnsupportedPaymentMethods()
+            $this->getUnsupportedPaymentMethods(),
+            $this->getSupportedPaymentMethods()
         );
     }
 
@@ -113,6 +113,10 @@ public function testGetConfig(
             ]
         );
 
+        $this->configMock->method('getPayLaterConfigValue')
+            ->with('experience_active')
+            ->willReturn(true);
+
         self::assertEquals($expected['sdkUrl'], $this->model->getUrl());
     }
 
@@ -150,14 +154,27 @@ private function getDisallowedFundingMap()
     private function getUnsupportedPaymentMethods()
     {
         return [
-            'venmo'=> 'venmo',
             'bancontact' => 'bancontact',
             'eps' => 'eps',
             'giropay' => 'giropay',
             'ideal' => 'ideal',
             'mybank' => 'mybank',
             'p24' => 'p24',
-            'sofort' => 'sofort'
+            'sofort' => 'sofort',
+        ];
+    }
+
+    /**
+     * Get supported payment methods
+     * See app/code/Magento/Paypal/etc/frontend/di.xml
+     *
+     * @return string[]
+     */
+    private function getSupportedPaymentMethods()
+    {
+        return [
+            'venmo'=> 'venmo',
+            'paylater'=> 'paylater',
         ];
     }
 }
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
index 52d488104f059..2ef84a252f825 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
@@ -27,6 +27,7 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                     'client-id' => 'sb',
                     'locale' => 'es_MX',
                     'currency' => 'USD',
+                    'enable-funding' => implode(',', ['venmo', 'paylater']),
                     'commit' => 'false',
                     'intent' => 'authorize',
                     'merchant-id' => 'merchant',
@@ -36,7 +37,6 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                             'credit',
                             'sepa',
                             'card',
-                            'venmo',
                             'bancontact',
                             'eps',
                             'giropay',
@@ -62,12 +62,13 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                     'client-id' => 'sb',
                     'locale' => 'en_BR',
                     'currency' => 'USD',
+                    'enable-funding' => implode(',', ['venmo', 'paylater']),
                     'commit' => 'false',
                     'intent' => 'capture',
                     'merchant-id' => 'merchant',
                     'disable-funding' => implode(
                         ',',
-                        ['venmo', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
+                        ['bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
                     ),
                     'components' => implode(',', ['messages', 'buttons'])
                 ]
@@ -85,12 +86,13 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                     'client-id' => 'sb',
                     'locale' => 'en_US',
                     'currency' => 'USD',
+                    'enable-funding' => implode(',', ['venmo', 'paylater']),
                     'commit' => 'false',
                     'intent' => 'order',
                     'merchant-id' => 'merchant',
                     'disable-funding' => implode(
                         ',',
-                        ['venmo', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
+                        ['bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
                     ),
                     'components' => implode(',', ['messages', 'buttons'])
                 ]
@@ -108,6 +110,7 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                     'client-id' => 'sb',
                     'locale' => 'en_BR',
                     'currency' => 'USD',
+                    'enable-funding' => implode(',', ['venmo', 'paylater']),
                     'commit' => 'false',
                     'intent' => 'authorize',
                     'merchant-id' => 'merchant',
@@ -117,7 +120,6 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                             'credit',
                             'sepa',
                             'card',
-                            'venmo',
                             'bancontact',
                             'eps',
                             'giropay',
@@ -143,12 +145,13 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                     'client-id' => 'sb',
                     'locale' => 'en_BR',
                     'currency' => 'USD',
+                    'enable-funding' => implode(',', ['venmo', 'paylater']),
                     'commit' => 'false',
                     'intent' => 'authorize',
                     'merchant-id' => 'merchant',
                     'disable-funding' => implode(
                         ',',
-                        ['credit', 'sepa', 'venmo', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
+                        ['credit', 'sepa', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
                     ),
                     'components' => implode(',', ['messages', 'buttons'])
                 ]

From 46124ab8ca79b0a1e1357e07a2315062ea9a4210 Mon Sep 17 00:00:00 2001
From: abhattGlo <glo36217@adobe.com>
Date: Fri, 29 Oct 2021 13:51:44 +0530
Subject: [PATCH 49/87] AC-1229:: Code Review Fixes

---
 app/code/Magento/Paypal/Model/SdkUrl.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/SdkUrl.php b/app/code/Magento/Paypal/Model/SdkUrl.php
index 7a6af6e01fc84..ae8c381124a36 100644
--- a/app/code/Magento/Paypal/Model/SdkUrl.php
+++ b/app/code/Magento/Paypal/Model/SdkUrl.php
@@ -111,7 +111,7 @@ public function getUrl(): string
                 'client-id' => $this->getClientId(),
                 'locale' => $this->localeResolver->getLocale(),
                 'currency' => $this->storeManager->getStore()->getBaseCurrencyCode(),
-                'enable-funding' => $this->getAllowedFunding()
+                'enable-funding' => $this->getAllowedFunding(),
             ];
 
             if ($this->areMessagesEnabled()) {
@@ -215,8 +215,9 @@ private function getAllowedFunding(): string
         $payLaterActive = (bool)$this->config->getPayLaterConfigValue('experience_active');
 
         // If Pay Later is disabled, paylater parameter will be removed from enable-funding parameter list
-        if ($payLaterActive === false) {
+        if (!$payLaterActive) {
             unset($this->supportedPaymentMethods['paylater']);
+
         }
         return implode(',', $this->supportedPaymentMethods);
     }

From f30f7772db72133456f6fd8443000847133e3ad1 Mon Sep 17 00:00:00 2001
From: glo5363 <glo05363@adobe.com>
Date: Fri, 29 Oct 2021 21:33:32 +0530
Subject: [PATCH 50/87] buyer country Changes applied for all paypal sdk
 methods

---
 app/code/Magento/Paypal/Model/Config.php                 | 2 ++
 app/code/Magento/Paypal/Model/SdkUrl.php                 | 2 +-
 app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php   | 2 +-
 .../Test/Unit/Model/_files/expected_url_config.php       | 2 +-
 .../Paypal/etc/adminhtml/system/payflow_advanced.xml     | 9 +++++++++
 .../Magento/Paypal/etc/adminhtml/system/payflow_link.xml | 9 +++++++++
 .../Paypal/etc/adminhtml/system/paypal_payflowpro.xml    | 9 +++++++++
 7 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index ce185150df745..1ad5e337b1ac8 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -1586,6 +1586,7 @@ protected function _mapWppFieldset($fieldName)
             case 'api_signature':
             case 'api_cert':
             case 'sandbox_flag':
+            case 'buyer_country':
             case 'use_proxy':
             case 'proxy_host':
             case 'proxy_port':
@@ -1626,6 +1627,7 @@ protected function _mapWpukFieldset($fieldName)
             case 'vendor':
             case 'pwd':
             case 'sandbox_flag':
+            case 'buyer_country':
             case 'use_proxy':
             case 'proxy_host':
             case 'proxy_port':
diff --git a/app/code/Magento/Paypal/Model/SdkUrl.php b/app/code/Magento/Paypal/Model/SdkUrl.php
index 97b98419d5c2b..b0a9de528e597 100644
--- a/app/code/Magento/Paypal/Model/SdkUrl.php
+++ b/app/code/Magento/Paypal/Model/SdkUrl.php
@@ -103,6 +103,7 @@ public function getUrl(): string
                 'client-id' => $this->getClientId(),
                 'locale' => $this->localeResolver->getLocale(),
                 'currency' => $this->storeManager->getStore()->getBaseCurrencyCode(),
+                'buyer-country' => $this->getBuyerCountry(),
             ];
 
             if ($this->areMessagesEnabled()) {
@@ -114,7 +115,6 @@ public function getUrl(): string
                 $params['intent'] = $this->getIntent();
                 $params['merchant-id'] = $this->config->getValue('merchant_id');
                 $params['disable-funding'] = $this->getDisallowedFunding();
-                $params['buyer-country'] = $this->getBuyerCountry();
                 $params = array_replace($params, $this->queryParams);
             }
             $params['components'] = implode(',', $components);
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php b/app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php
index 73ec49703a0f8..b4bf90ff5b022 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php
@@ -104,8 +104,8 @@ public function testGetConfig(
                 ['merchant_id', null, 'merchant'],
                 ['sandbox_client_id', null, 'sb'],
                 ['sandbox_flag', null, true],
-                ['disable_funding_options', null, $disallowedFunding],
                 ['buyer_country', null, $isBuyerCountryEnabled ? 'US' : ''],
+                ['disable_funding_options', null, $disallowedFunding],
                 ['paymentAction', null, $intent],
                 ['in_context', null, true],
                 [
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
index ad0d719bc08f6..a3ec843549932 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
@@ -172,6 +172,7 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                     'client-id' => 'sb',
                     'locale' => 'en_BR',
                     'currency' => 'USD',
+                    'buyer-country' => 'US',
                     'commit' => 'false',
                     'intent' => 'authorize',
                     'merchant-id' => 'merchant',
@@ -179,7 +180,6 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                         ',',
                         ['credit', 'sepa', 'venmo', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
                     ),
-                    'buyer-country' => 'US',
                     'components' => implode(',', ['messages', 'buttons'])
                 ]
             )
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
index ad5cf316a7a5b..c9d364da5516c 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
@@ -55,6 +55,15 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
+                <field id="buyer_country" translate="label" type="select" sortOrder="65" showInDefault="1" showInWebsite="1">
+                    <label>Buyer Country</label>
+                    <config_path>payment/payflow_advanced/buyer_country</config_path>
+                    <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+                    <attribute type="shared">1</attribute>
+                    <depends>
+                        <field id="sandbox_flag">1</field>
+                    </depends>
+                </field>
                 <field id="use_proxy" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
                     <label>Use Proxy</label>
                     <config_path>payment/payflow_advanced/use_proxy</config_path>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
index bde6ac8f0c022..2dd874b112e71 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
@@ -56,6 +56,15 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
+                <field id="buyer_country" translate="label" type="select" sortOrder="55" showInDefault="1" showInWebsite="1">
+                    <label>Buyer Country</label>
+                    <config_path>payment/payflow_link/buyer_country</config_path>
+                    <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+                    <attribute type="shared">1</attribute>
+                    <depends>
+                        <field id="sandbox_flag">1</field>
+                    </depends>
+                </field>
                 <field id="use_proxy" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1">
                     <label>Use Proxy</label>
                     <config_path>payment/payflow_link/use_proxy</config_path>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
index 8afc2a961fb74..acce12e98eafb 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
@@ -51,6 +51,15 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <attribute type="shared">1</attribute>
                 </field>
+                <field id="buyer_country" translate="label" type="select" sortOrder="65" showInDefault="1" showInWebsite="1">
+                    <label>Buyer Country</label>
+                    <config_path>payment/payflowpro/buyer_country</config_path>
+                    <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+                    <attribute type="shared">1</attribute>
+                    <depends>
+                        <field id="sandbox_flag">1</field>
+                    </depends>
+                </field>
                 <field id="use_proxy" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
                     <label>Use Proxy</label>
                     <config_path>payment/payflowpro/use_proxy</config_path>

From 9e9fec61dfa223141249df33403312880530fdd1 Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Mon, 1 Nov 2021 16:17:21 +0530
Subject: [PATCH 51/87] AC-1228::BN Code for all Paypal methods

---
 .../Magento/Paypal/Model/SmartButtonConfig.php    | 15 +++++++--------
 .../Test/Unit/Model/SmartButtonConfigTest.php     |  9 +--------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/SmartButtonConfig.php b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
index 9deeacccb7fca..509b21a836145 100644
--- a/app/code/Magento/Paypal/Model/SmartButtonConfig.php
+++ b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
@@ -12,7 +12,7 @@
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Paypal\Model\Payflowpro;
+use Magento\Paypal\Model\Config as PaypalConfig;
 
 /**
  * Provides configuration values for PayPal in-context checkout
@@ -45,16 +45,16 @@ class SmartButtonConfig
     private $sdkUrl;
 
     /**
-     * @var Payflowpro
+     * @var PaypalConfig
      */
-    private $payflowpro;
+    private $paypalConfig;
 
     /**
      * @param ResolverInterface $localeResolver
      * @param ConfigFactory $configFactory
      * @param ScopeConfigInterface $scopeConfig
      * @param SdkUrl $sdkUrl
-     * @param Payflowpro $payflowpro
+     * @param PaypalConfig $paypalConfig
      * @param array $defaultStyles
      */
     public function __construct(
@@ -62,7 +62,7 @@ public function __construct(
         ConfigFactory $configFactory,
         ScopeConfigInterface $scopeConfig,
         SdkUrl $sdkUrl,
-        Payflowpro $payflowpro,
+        PaypalConfig $paypalConfig,
         $defaultStyles = []
     ) {
         $this->localeResolver = $localeResolver;
@@ -71,7 +71,7 @@ public function __construct(
         $this->scopeConfig = $scopeConfig;
         $this->defaultStyles = $defaultStyles;
         $this->sdkUrl = $sdkUrl;
-        $this->payflowpro = $payflowpro;
+        $this->paypalConfig = $paypalConfig;
     }
 
     /**
@@ -86,14 +86,13 @@ public function getConfig(string $page): array
             Data::XML_PATH_GUEST_CHECKOUT,
             ScopeInterface::SCOPE_STORE
         );
-        $config = $this->payflowpro->getConfig();
         return [
             'styles' => $this->getButtonStyles($page),
             'isVisibleOnProductPage'  => (bool)$this->config->getValue('visible_on_product'),
             'isGuestCheckoutAllowed'  => $isGuestCheckoutAllowed,
             'sdkUrl' => $this->sdkUrl->getUrl(),
             'dataAttributes' => [
-                'data-partner-attribution-id' => ($config) ? $config->getBuildNotationCode() : ''
+                'data-partner-attribution-id' => $this->paypalConfig->getBuildNotationCode()
             ]
         ];
     }
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
index d8cdcbf595642..03073c3187703 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
@@ -16,7 +16,6 @@
 use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Magento\Paypal\Model\Payflowpro;
 
 /**
  * Test for smart button config
@@ -38,11 +37,6 @@ class SmartButtonConfigTest extends TestCase
      */
     private $configMock;
 
-    /**
-     * @var MockObject
-     */
-    private $payflowproMock;
-
     /**
      * @inheritDoc
      */
@@ -52,7 +46,6 @@ protected function setUp(): void
         $this->configMock           = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->payflowproMock       = $this->createMock(Payflowpro::class);
 
         /** @var ScopeConfigInterface|MockObject $scopeConfigMock */
         $scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
@@ -74,7 +67,7 @@ protected function setUp(): void
             $configFactoryMock,
             $scopeConfigMock,
             $sdkUrl,
-            $this->payflowproMock,
+            $this->configMock,
             $this->getDefaultStyles()
         );
     }

From c0f7468c02a964bf684e88fad011fff90483e75b Mon Sep 17 00:00:00 2001
From: Kate Kyzyma <kate@atwix.com>
Date: Mon, 1 Nov 2021 15:09:11 +0200
Subject: [PATCH 52/87] Replace repetitive actions

---
 .../CatalogProductListWidgetOperatorsTest.xml | 36 ++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOperatorsTest.xml b/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOperatorsTest.xml
index 6019c00560bfe..fd16a579066ab 100644
--- a/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOperatorsTest.xml
+++ b/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOperatorsTest.xml
@@ -53,11 +53,13 @@
         </actionGroup>
 
         <!--Go to Catalog > Categories (choose category where created products)-->
-        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="onCategoryIndexPage"/>
-        <waitForPageLoad stepKey="waitForCategoryPageLoadAddProducts" after="onCategoryIndexPage"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickExpandAll" after="waitForCategoryPageLoadAddProducts"/>
-        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="clickCategoryLink"/>
-        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="onCategoryIndexPage"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForCategoryPageLoadAddProducts"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickExpandAll"/>
+        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="clickCategoryLink">
+            <argument name="category" value="SimpleSubCategory"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForCategoryPageLoad"/>
 
         <!--Content > Add CMS Block: name saved block-->
         <waitForElementVisible selector="{{AdminCategoryContentSection.sectionHeader}}" stepKey="waitForContentSection"/>
@@ -75,8 +77,10 @@
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="seeSuccessMessage"/>
 
         <!--Go to Storefront > category-->
-        <amOnPage url="$$simplecategory.custom_attributes[url_key]$$.html" stepKey="goToStorefrontCategoryPage"/>
-        <waitForPageLoad stepKey="waitForStorefrontPageLoaded"/>
+        <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="goToStorefrontCategoryPage">
+            <argument name="category" value="$$simplecategory$$"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForStorefrontPageLoaded"/>
 
         <!--Check operators Greater than-->
         <dontSeeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('10')}}" stepKey="dontSeeElementByPrice20"/>
@@ -95,8 +99,10 @@
         </actionGroup>
 
         <!--Go to Storefront > category-->
-        <amOnPage url="$$simplecategory.custom_attributes[url_key]$$.html" stepKey="goToStorefrontCategoryPage2"/>
-        <waitForPageLoad stepKey="waitForStorefrontPageLoaded2"/>
+        <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="goToStorefrontCategoryPage2">
+            <argument name="category" value="$$simplecategory$$"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForStorefrontPageLoaded2"/>
 
         <!--Check operators Greater than-->
         <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('10')}}" stepKey="seeElementByPrice20"/>
@@ -115,8 +121,10 @@
         </actionGroup>
 
         <!--Go to Storefront > category-->
-        <amOnPage url="$$simplecategory.custom_attributes[url_key]$$.html" stepKey="goToStorefrontCategoryPage3"/>
-        <waitForPageLoad stepKey="waitForStorefrontPageLoaded3"/>
+        <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="goToStorefrontCategoryPage3">
+            <argument name="category" value="$$simplecategory$$"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForStorefrontPageLoaded3"/>
 
         <!--Check operators Greater than-->
         <dontSeeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('10')}}" stepKey="dontSeeElementByPrice20s"/>
@@ -135,8 +143,10 @@
         </actionGroup>
 
         <!--Go to Storefront > category-->
-        <amOnPage url="$$simplecategory.custom_attributes[url_key]$$.html" stepKey="goToStorefrontCategoryPage4"/>
-        <waitForPageLoad stepKey="waitForStorefrontPageLoaded4"/>
+        <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="goToStorefrontCategoryPage4">
+            <argument name="category" value="$$simplecategory$$"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForStorefrontPageLoaded4"/>
 
         <!--Check operators Greater than-->
         <seeElement selector="{{InsertWidgetSection.checkElementStorefrontByPrice('10')}}" stepKey="seeElementByPrice20s"/>

From a58d708d0242491fe599289ba95fdba7c5a0ceac Mon Sep 17 00:00:00 2001
From: glo5363 <glo05363@adobe.com>
Date: Tue, 2 Nov 2021 14:03:51 +0530
Subject: [PATCH 53/87] Code review changes

---
 app/code/Magento/Paypal/Model/Config.php      |    2 +-
 app/code/Magento/Paypal/Model/SdkUrl.php      |    4 +-
 .../Unit/Model/_files/expected_url_config.php |   12 +-
 app/code/Magento/Paypal/i18n/en_US.csv        | 1299 +++++++++--------
 4 files changed, 658 insertions(+), 659 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 1ad5e337b1ac8..447e95b1cce4a 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -831,7 +831,7 @@ public function getCountryMethods($countryCode = null)
      * @param string $token
      * @return string
      */
-    public function getPayPalBasicStartUrl($token)
+    public function getPayPalBasicStartUrl($token): string
     {
         $params = [
             'cmd' => '_express-checkout',
diff --git a/app/code/Magento/Paypal/Model/SdkUrl.php b/app/code/Magento/Paypal/Model/SdkUrl.php
index b0a9de528e597..724674cde7a45 100644
--- a/app/code/Magento/Paypal/Model/SdkUrl.php
+++ b/app/code/Magento/Paypal/Model/SdkUrl.php
@@ -177,9 +177,7 @@ private function getClientId()
      */
     private function getBuyerCountry(): string
     {
-        return (int)$this->config->getValue('sandbox_flag') ?
-            $this->config->getValue('buyer_country') :
-            '';
+        return (int)$this->config->getValue('sandbox_flag') ? $this->config->getValue('buyer_country') : '';
     }
 
     /**
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
index a3ec843549932..74b26f1ddd018 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
@@ -47,7 +47,7 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                             'sofort'
                         ]
                     ),
-                    'components' => implode(',', ['messages', 'buttons'])
+                    'components' => implode(',', ['messages', 'buttons']),
                 ]
             )
         ]
@@ -71,7 +71,7 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                         ',',
                         ['venmo', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
                     ),
-                    'components' => implode(',', ['messages', 'buttons'])
+                    'components' => implode(',', ['messages', 'buttons']),
                 ]
             )
         ]
@@ -95,7 +95,7 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                         ',',
                         ['venmo', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
                     ),
-                    'components' => implode(',', ['messages', 'buttons'])
+                    'components' => implode(',', ['messages', 'buttons']),
                 ]
             )
         ]
@@ -131,7 +131,7 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                             'sofort'
                         ]
                     ),
-                    'components' => implode(',', ['messages', 'buttons'])
+                    'components' => implode(',', ['messages', 'buttons']),
                 ]
             )
         ]
@@ -155,7 +155,7 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                         ',',
                         ['credit', 'sepa', 'venmo', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
                     ),
-                    'components' => implode(',', ['messages', 'buttons'])
+                    'components' => implode(',', ['messages', 'buttons']),
                 ]
             )
         ]
@@ -204,7 +204,7 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                         ',',
                         ['credit', 'sepa', 'venmo', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
                     ),
-                    'components' => implode(',', ['messages', 'buttons'])
+                    'components' => implode(',', ['messages', 'buttons']),
                 ]
             )
         ]
diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
index ba80baf49b7bf..4357c8d828a71 100644
--- a/app/code/Magento/Paypal/i18n/en_US.csv
+++ b/app/code/Magento/Paypal/i18n/en_US.csv
@@ -12,485 +12,486 @@
                                 Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                                 The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
                                 or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
-                "
-payflowpro,"Payflow Pro"
-"Billing Agreements","Billing Agreements"
-ID,ID
-Email,Email
-"First Name","First Name"
-"Last Name","Last Name"
-"Reference ID","Reference ID"
-Status,Status
-Created,Created
-N/A,N/A
-Updated,Updated
-Back,Back
-"Are you sure you want to do this?","Are you sure you want to do this?"
-Cancel,Cancel
-"Billing Agreement #%1","Billing Agreement #%1"
-"General Information","General Information"
-"Related Orders","Related Orders"
-Order,Order
-Purchased,Purchased
-"Bill-to Name","Bill-to Name"
-"Ship-to Name","Ship-to Name"
-"Order Total","Order Total"
-"Purchase Point","Purchase Point"
-"Billing Agreement View","Billing Agreement View"
-"View Transaction Details","View Transaction Details"
-"Reference Information","Reference Information"
-"Transaction Information","Transaction Information"
-"PayPal Fee Information","PayPal Fee Information"
-"PayPal Settlement Reports","PayPal Settlement Reports"
-"We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?","We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?"
-"Fetch Updates","Fetch Updates"
-button_label,button_label
-sandbox_button_label,sandbox_button_label
-Help,Help
-Configure,Configure
-Close,Close
-"Learn More","Learn More"
-"View Demo","View Demo"
-"See terms","See terms"
-"You will be redirected to the PayPal website.","You will be redirected to the PayPal website."
-"You will be redirected to the PayPal website when you place an order.","You will be redirected to the PayPal website when you place an order."
-"Incl. Tax","Incl. Tax"
-"Billing Information","Billing Information"
-"Shipping Information","Shipping Information"
-"Invalid block type","Invalid block type"
-"Please specify the correct billing agreement ID and try again.","Please specify the correct billing agreement ID and try again."
-"You canceled the billing agreement.","You canceled the billing agreement."
-"We can't cancel the billing agreement.","We can't cancel the billing agreement."
-"You deleted the billing agreement.","You deleted the billing agreement."
-"We can't delete the billing agreement.","We can't delete the billing agreement."
-Reports,Reports
-Sales,Sales
-"View Transaction","View Transaction"
-"We found nothing to fetch because of an empty configuration.","We found nothing to fetch because of an empty configuration."
-"We fetched %1 report rows from ""%2@%3.""","We fetched %1 report rows from ""%2@%3."""
-"We can't fetch reports from ""%1@%2.""","We can't fetch reports from ""%1@%2."""
-"The billing agreement ""%1"" has been canceled.","The billing agreement ""%1"" has been canceled."
-"The billing agreement ""%1"" has been created.","The billing agreement ""%1"" has been created."
-"We couldn't finish the billing agreement wizard.","We couldn't finish the billing agreement wizard."
-"We can't start the billing agreement wizard.","We can't start the billing agreement wizard."
-"Billing Agreement # %1","Billing Agreement # %1"
-"We can't initialize Express Checkout.","We can't initialize Express Checkout."
-"PayPal Express Checkout Token does not exist.","PayPal Express Checkout Token does not exist."
-"A wrong PayPal Express Checkout Token is specified.","A wrong PayPal Express Checkout Token is specified."
-"Express Checkout and Order have been canceled.","Express Checkout and Order have been canceled."
-"Express Checkout has been canceled.","Express Checkout has been canceled."
-"Unable to cancel Express Checkout","Unable to cancel Express Checkout"
-"Please agree to all the terms and conditions before placing the order.","Please agree to all the terms and conditions before placing the order."
-"We can't place the order.","We can't place the order."
-"We can't process Express Checkout approval.","We can't process Express Checkout approval."
-"We can't initialize Express Checkout review.","We can't initialize Express Checkout review."
-"We can't update shipping method.","We can't update shipping method."
-"We can't start Express Checkout.","We can't start Express Checkout."
-"To check out, please sign in with your email address.","To check out, please sign in with your email address."
-"Sorry, but something went wrong","Sorry, but something went wrong"
-"Your payment has been declined. Please try again.","Your payment has been declined. Please try again."
-"Requested payment method does not match with order.","Requested payment method does not match with order."
-"Would you like to sign a billing agreement to streamline further purchases with PayPal?","Would you like to sign a billing agreement to streamline further purchases with PayPal?"
-"Error processing payment, please try again later.","Error processing payment, please try again later."
-"Payment Gateway is unreachable at the moment. Please use another payment option.","Payment Gateway is unreachable at the moment. Please use another payment option."
-"PayPal response hasn't required fields.","PayPal response hasn't required fields."
-"Something went wrong while processing your order.","Something went wrong while processing your order."
-"PayPal gateway has rejected request. %1","PayPal gateway has rejected request. %1"
-"The PayPal gateway rejected the request. %1","The PayPal gateway rejected the request. %1"
-"I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.","I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you."
-"I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.","I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you."
-"A match of the Shipping Address City, State, and Postal Code failed.","A match of the Shipping Address City, State, and Postal Code failed."
-"The payment method code is not set.","The payment method code is not set."
-"The reference ID is not set.","The reference ID is not set."
-"Unable to save Billing Agreement:","Unable to save Billing Agreement:"
-Active,Active
-Canceled,Canceled
-"The customer ID is not set.","The customer ID is not set."
-"The Billing Agreement status is not set.","The Billing Agreement status is not set."
-"The PayPal certificate does not exist.","The PayPal certificate does not exist."
-"We prefer PayPal (150 X 60)","We prefer PayPal (150 X 60)"
-"We prefer PayPal (150 X 40)","We prefer PayPal (150 X 40)"
-"Now accepting PayPal (150 X 60)","Now accepting PayPal (150 X 60)"
-"Now accepting PayPal (150 X 40)","Now accepting PayPal (150 X 40)"
-"Payments by PayPal (150 X 60)","Payments by PayPal (150 X 60)"
-"Payments by PayPal (150 X 40)","Payments by PayPal (150 X 40)"
-"Shop now using (150 X 60)","Shop now using (150 X 60)"
-"Shop now using (150 X 40)","Shop now using (150 X 40)"
-Dynamic,Dynamic
-Static,Static
-Shortcut,Shortcut
-"Acceptance Mark Image","Acceptance Mark Image"
-Authorization,Authorization
-Sale,Sale
-Yes,Yes
-No,No
-"For Virtual Quotes Only","For Virtual Quotes Only"
-Auto,Auto
-"Ask Customer","Ask Customer"
-Never,Never
-"IPN (Instant Payment Notification) Only","IPN (Instant Payment Notification) Only"
-"API Signature","API Signature"
-"API Certificate","API Certificate"
-"The ordering amount of %1 is pending approval on the payment gateway.","The ordering amount of %1 is pending approval on the payment gateway."
-"Ordered amount of %1","Ordered amount of %1"
-"We'll authorize the amount of %1 as soon as the payment gateway approves it.","We'll authorize the amount of %1 as soon as the payment gateway approves it."
-"The authorized amount is %1.","The authorized amount is %1."
-"The maximum number of child authorizations is reached.","The maximum number of child authorizations is reached."
-"PayPal can't process orders with a zero balance due. To finish your purchase, please go through the standard checkout process.","PayPal can't process orders with a zero balance due. To finish your purchase, please go through the standard checkout process."
-"A payer is not identified.","A payer is not identified."
-"Cannot get secure form URL from PayPal","Cannot get secure form URL from PayPal"
-"Last Transaction ID","Last Transaction ID"
-"This customer didn't include a confirmed address.","This customer didn't include a confirmed address."
-"The payment is authorized but not settled.","The payment is authorized but not settled."
-"The payment eCheck is not cleared.","The payment eCheck is not cleared."
-"The merchant holds a non-U.S. account and doesn't have a withdrawal mechanism.","The merchant holds a non-U.S. account and doesn't have a withdrawal mechanism."
-"The payment currency doesn't match any of the merchant's balances currency.","The payment currency doesn't match any of the merchant's balances currency."
-"The payment is pending while it is being reviewed by PayPal for risk.","The payment is pending while it is being reviewed by PayPal for risk."
-"The payment is pending because it was made to an email address that is not yet registered or confirmed.","The payment is pending because it was made to an email address that is not yet registered or confirmed."
-"The merchant account is not yet verified.","The merchant account is not yet verified."
-"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status."
-"Sorry, but something went wrong. Please contact PayPal customer service.","Sorry, but something went wrong. Please contact PayPal customer service."
-"A reversal has occurred on this transaction due to a chargeback by your customer.","A reversal has occurred on this transaction due to a chargeback by your customer."
-"A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.","A reversal has occurred on this transaction due to your customer triggering a money-back guarantee."
-"A reversal has occurred on this transaction due to a complaint about the transaction from your customer.","A reversal has occurred on this transaction due to a complaint about the transaction from your customer."
-"A reversal has occurred on this transaction because you have given the customer a refund.","A reversal has occurred on this transaction because you have given the customer a refund."
-"Reversal of an adjustment.","Reversal of an adjustment."
-"Transaction reversal due to fraud detected by PayPal administrators.","Transaction reversal due to fraud detected by PayPal administrators."
-"Transaction reversal by PayPal administrators.","Transaction reversal by PayPal administrators."
-"Reimbursement for a chargeback.","Reimbursement for a chargeback."
-"Settlement of a chargeback.","Settlement of a chargeback."
-"A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.","A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof."
-"Buyer claims that he did not receive goods or service.","Buyer claims that he did not receive goods or service."
-"Buyer claims that the goods or service received differ from merchant’s description of the goods or service.","Buyer claims that the goods or service received differ from merchant’s description of the goods or service."
-"Buyer claims that he/she did not authorize transaction.","Buyer claims that he/she did not authorize transaction."
-"A case that has been resolved and close requires a reimbursement.","A case that has been resolved and close requires a reimbursement."
-"Buyer claims that a possible duplicate payment was made to the merchant.","Buyer claims that a possible duplicate payment was made to the merchant."
-"Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.","Buyer claims that the received merchandise is unsatisfactory, defective, or damaged."
-"Unknown reason. Please contact PayPal customer service.","Unknown reason. Please contact PayPal customer service."
-"Payer ID","Payer ID"
-"Payer Email","Payer Email"
-"Payer Status","Payer Status"
-"Payer Address ID","Payer Address ID"
-"Payer Address Status","Payer Address Status"
-"Merchant Protection Eligibility","Merchant Protection Eligibility"
-"Triggered Fraud Filters","Triggered Fraud Filters"
-"Last Correlation ID","Last Correlation ID"
-"Address Verification System Response","Address Verification System Response"
-"CVV2 Check Result by PayPal","CVV2 Check Result by PayPal"
-"AVS Street Match","AVS Street Match"
-"AVS zip","AVS zip"
-"International AVS response","International AVS response"
-"Buyer's Tax ID","Buyer's Tax ID"
-"Buyer's Tax ID Type","Buyer's Tax ID Type"
-Chargeback,Chargeback
-Complaint,Complaint
-Dispute,Dispute
-"Matched Address only (no ZIP)","Matched Address only (no ZIP)"
-"Matched Address only (no ZIP) International","Matched Address only (no ZIP) International"
-"No Details matched","No Details matched"
-"No Details matched. International","No Details matched. International"
-"Exact Match.","Exact Match."
-"Exact Match. Address and Postal Code. International","Exact Match. Address and Postal Code. International"
-"Exact Match. Address and Postal Code. UK-specific","Exact Match. Address and Postal Code. UK-specific"
-"N/A. Not allowed for MOTO (Internet/Phone) transactions","N/A. Not allowed for MOTO (Internet/Phone) transactions"
-"N/A. Global Unavailable","N/A. Global Unavailable"
-"N/A. International Unavailable","N/A. International Unavailable"
-"Matched five-digit ZIP only (no Address)","Matched five-digit ZIP only (no Address)"
-"Matched Postal Code only (no Address)","Matched Postal Code only (no Address)"
-"N/A. Retry","N/A. Retry"
-"N/A. Service not Supported","N/A. Service not Supported"
-"N/A. Unavailable","N/A. Unavailable"
-"Matched whole nine-digit ZIP (no Address)","Matched whole nine-digit ZIP (no Address)"
-"Yes. Matched Address and five-digit ZIP","Yes. Matched Address and five-digit ZIP"
-"All the address information matched","All the address information matched"
-"None of the address information matched","None of the address information matched"
-"Part of the address information matched","Part of the address information matched"
-"N/A. The merchant did not provide AVS information","N/A. The merchant did not provide AVS information"
-"N/A. Address not checked, or acquirer had no response. Service not available","N/A. Address not checked, or acquirer had no response. Service not available"
-"Matched (CVV2CSC)","Matched (CVV2CSC)"
-"No match","No match"
-"N/A. Not processed","N/A. Not processed"
-"N/A. Service not supported","N/A. Service not supported"
-"N/A. Service not available","N/A. Service not available"
-"N/A. No response","N/A. No response"
-"Matched (CVV2)","Matched (CVV2)"
-"N/A. The merchant has not implemented CVV2 code handling","N/A. The merchant has not implemented CVV2 code handling"
-"N/A. Merchant has indicated that CVV2 is not present on card","N/A. Merchant has indicated that CVV2 is not present on card"
-CNPJ,CNPJ
-CPF,CPF
-"Note: %1","Note: %1"
-"IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4","IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4"
-"IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3.","IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3."
-"You notified customer about invoice #%1.","You notified customer about invoice #%1."
-"We cannot cancel this order.","We cannot cancel this order."
-"IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4""","IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4"""
-"You notified customer about creditmemo #%1.","You notified customer about creditmemo #%1."
-"IPN ""%1""","IPN ""%1"""
-"Payflow PNREF: #%1.","Payflow PNREF: #%1."
-"Unable to fetch transaction details.","Unable to fetch transaction details."
-"Invalid method %1::%2","Invalid method %1::%2"
-"Transaction has been declined","Transaction has been declined"
-"Error processing payment. Please try again later.","Error processing payment. Please try again later."
-"We cannot send the new order email.","We cannot send the new order email."
-"Payment error. %value was not found.","Payment error. %value was not found."
-"You cannot void a verification transaction.","You cannot void a verification transaction."
-"You need an authorization transaction to void.","You need an authorization transaction to void."
-"We can't issue a refund transaction because there is no capture transaction.","We can't issue a refund transaction because there is no capture transaction."
-"We cannot create a target file for reading reports.","We cannot create a target file for reading reports."
-"Report Date","Report Date"
-"Merchant Account","Merchant Account"
-"Transaction ID","Transaction ID"
-"Invoice ID","Invoice ID"
-"PayPal Reference ID","PayPal Reference ID"
-"PayPal Reference ID Type","PayPal Reference ID Type"
-"Event Code","Event Code"
-Event,Event
-"Start Date","Start Date"
-"Finish Date","Finish Date"
-"Debit or Credit","Debit or Credit"
-"Gross Amount","Gross Amount"
-"Fee Debit or Credit","Fee Debit or Credit"
-"Fee Amount","Fee Amount"
-Custom,Custom
-"Order ID","Order ID"
-"Preapproved Payment ID","Preapproved Payment ID"
-"Subscription ID","Subscription ID"
-Credit,Credit
-Debit,Debit
-"ACH Deposit (Hold for Dispute or Other Investigation)","ACH Deposit (Hold for Dispute or Other Investigation)"
-"ACH Deposit (Reversal)","ACH Deposit (Reversal)"
-"ACH Funding for Funds Recovery from Account Balance","ACH Funding for Funds Recovery from Account Balance"
-"ACH Withdrawal","ACH Withdrawal"
-"Account-to-Account Payment, initiated by PayPal","Account-to-Account Payment, initiated by PayPal"
-"Auction Payment other than through eBay","Auction Payment other than through eBay"
-AutoSweep,AutoSweep
-"Available Balance","Available Balance"
-"Balance Manager Account Bonus","Balance Manager Account Bonus"
-"Bonus for first ACH Use","Bonus for first ACH Use"
-"Buyer Credit Payment","Buyer Credit Payment"
-Charge-off,Charge-off
-"Coupon Redemption","Coupon Redemption"
-"Currency Conversion required to cover negative balance","Currency Conversion required to cover negative balance"
-"Debit Card Cash Back","Debit Card Cash Back"
-"Debit Card Transaction","Debit Card Transaction"
-"Direct Payment API","Direct Payment API"
-"EFT Funding (German banking)","EFT Funding (German banking)"
-"Express Checkout APIs","Express Checkout APIs"
-"Fee Reversal","Fee Reversal"
-"Fee: Foreign ACH Withdrawal","Fee: Foreign ACH Withdrawal"
-"Fee: Mass Pay Request","Fee: Mass Pay Request"
-"Fee: Web Site Payments Pro Account Monthly","Fee: Web Site Payments Pro Account Monthly"
-"Fee: WorldLink Check Withdrawal","Fee: WorldLink Check Withdrawal"
-Funding,Funding
-"General (Authorization)","General (Authorization)"
-"General (Dividend)","General (Dividend)"
-"General (Funds Transfer from PayPal Account to Another)","General (Funds Transfer from PayPal Account to Another)"
-"General (Purchase with a credit card)","General (Purchase with a credit card)"
-"General Adjustment without businessrelated event","General Adjustment without businessrelated event"
-"General Currency Conversion","General Currency Conversion"
-"General Funding of PayPal Account ","General Funding of PayPal Account "
-"General Redemption","General Redemption"
-"General Withdrawal from PayPal Account","General Withdrawal from PayPal Account"
-"General. Product no longer supported","General. Product no longer supported"
-"General: Use of PayPal account for purchasing as well as receiving payments","General: Use of PayPal account for purchasing as well as receiving payments"
-"General: Withdrawal from PayPal Account","General: Withdrawal from PayPal Account"
-"General: Withdrawal to Non-Bank Entity","General: Withdrawal to Non-Bank Entity"
-"General: adjustment of a type not belonging to the other T12xx categories","General: adjustment of a type not belonging to the other T12xx categories"
-"General: bonus of a type not belonging to the other T08xx categories","General: bonus of a type not belonging to the other T08xx categories"
-"General: event not yet categorized","General: event not yet categorized"
-"General: non-payment fee of a type not belonging to the other T01xx categories","General: non-payment fee of a type not belonging to the other T01xx categories"
-"General: received payment of a type not belonging to the other T00xx categories","General: received payment of a type not belonging to the other T00xx categories"
-"General: reversal of a type not belonging to the other T11xx categories","General: reversal of a type not belonging to the other T11xx categories"
-"General: temporary hold of a type not belonging to the other T15xx categories","General: temporary hold of a type not belonging to the other T15xx categories"
-"Gift Certificate Payment: purchase of Gift Certificate","Gift Certificate Payment: purchase of Gift Certificate"
-"Gift Certificate Redemption","Gift Certificate Redemption"
-"Hidden Virtual PayPal Debit Card Transaction","Hidden Virtual PayPal Debit Card Transaction"
-"Hold for Dispute Investigation","Hold for Dispute Investigation"
-Incentive,Incentive
-"Mass Pay Payment","Mass Pay Payment"
-"Merchant Referral Bonus","Merchant Referral Bonus"
-"Mobile Payment (made via a mobile phone)","Mobile Payment (made via a mobile phone)"
-"Negative Balance","Negative Balance"
-"Open Authorization","Open Authorization"
-"PayPal Balance Manager function of PayPal account","PayPal Balance Manager function of PayPal account"
-"PayPal Buyer Warranty Bonus","PayPal Buyer Warranty Bonus"
-"PayPal Debit Card Cash Advance","PayPal Debit Card Cash Advance"
-"PayPal Debit Card Withdrawal from ATM","PayPal Debit Card Withdrawal from ATM"
-"PayPal Protection Bonus","PayPal Protection Bonus"
-"Payment Refund initiated by merchant","Payment Refund initiated by merchant"
-"Points Incentive Redemption","Points Incentive Redemption"
-"Postage Payment to either USPS or UPS","Postage Payment to either USPS or UPS"
-"Preapproved Payment (BillUser API, either sent or received","Preapproved Payment (BillUser API, either sent or received"
-Reauthorization,Reauthorization
-"Reimbursement of Chargeback","Reimbursement of Chargeback"
-Reversal,Reversal
-"Reversal of General Account Hold","Reversal of General Account Hold"
-"Reversal of Points Usage","Reversal of Points Usage"
-"Reversal of hold for Dispute Investigation","Reversal of hold for Dispute Investigation"
-"Reward Voucher Redemption","Reward Voucher Redemption"
-"Settlement Consolidation","Settlement Consolidation"
-"Subscription Payment, either payment sent or payment received","Subscription Payment, either payment sent or payment received"
-"User-initiated Currency Conversion","User-initiated Currency Conversion"
-"Virtual PayPal Debit Card Transaction","Virtual PayPal Debit Card Transaction"
-"Virtual Terminal Payment","Virtual Terminal Payment"
-Void,Void
-"WorldLink Withdrawal","WorldLink Withdrawal"
-"eBay Auction Payment","eBay Auction Payment"
-"The PayPal certificate file is empty.","The PayPal certificate file is empty."
-"Header (center)","Header (center)"
-"Sidebar (right)","Sidebar (right)"
-"Near PayPal Credit checkout button","Near PayPal Credit checkout button"
-"--Please Select--","--Please Select--"
-Daily,Daily
-"Every 3 days","Every 3 days"
-"Every 7 days","Every 7 days"
-"Every 10 days","Every 10 days"
-"Every 14 days","Every 14 days"
-"Every 30 days","Every 30 days"
-"Every 40 days","Every 40 days"
-"No Logo","No Logo"
-"Yes (PayPal recommends this option)","Yes (PayPal recommends this option)"
-"Created billing agreement #%1.","Created billing agreement #%1."
-"We can't create a billing agreement for this order.","We can't create a billing agreement for this order."
-"Pending PayPal","Pending PayPal"
-"PayPal Reversed","PayPal Reversed"
-"PayPal Canceled Reversal","PayPal Canceled Reversal"
-Error,Error
-"Billing Agreement","Billing Agreement"
-"Please Select","Please Select"
-Customer,Customer
-"Created At","Created At"
-"Updated At","Updated At"
-ending,ending
-expires,expires
-"Not sure what PayPal payment method to use? Click ","Not sure what PayPal payment method to use? Click "
-here,here
-" to learn more."," to learn more."
-"Important: ","Important: "
-"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website."
-"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
-"To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.","To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website."
-"Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
-"Credit Card Type","Credit Card Type"
-"Credit Card Number","Credit Card Number"
-"Expiration Date","Expiration Date"
-"Card Verification Number","Card Verification Number"
-"Billing Agreement # ","Billing Agreement # "
-"Agreement Information","Agreement Information"
-"Reference ID:","Reference ID:"
-Status:,Status:
-Created:,Created:
-Updated:,Updated:
-"Payment Method:","Payment Method:"
-"Order #","Order #"
-Date,Date
-"Ship To","Ship To"
-"Order Status","Order Status"
-"View Order","View Order"
-"Back to Billing Agreements","Back to Billing Agreements"
-"Payment Method","Payment Method"
-View,View
-"There are no billing agreements yet.","There are no billing agreements yet."
-"New Billing Agreement","New Billing Agreement"
-"You will be redirected to the payment system website.","You will be redirected to the payment system website."
-"-- Please Select --","-- Please Select --"
-Create...,Create...
-"Your credit card will be charged for","Your credit card will be charged for"
-"Your billing agreement # is: ","Your billing agreement # is: "
-"Shipping Method","Shipping Method"
-"Please select a shipping method...","Please select a shipping method..."
-"Update Shipping Method","Update Shipping Method"
-"Sorry, no quotes are available for this order right now.","Sorry, no quotes are available for this order right now."
-"Shipping Address","Shipping Address"
-Edit,Edit
-"Buy now with PayPal","Buy now with PayPal"
-"Edit Payment Information","Edit Payment Information"
-"Items in Your Shopping Cart","Items in Your Shopping Cart"
-"Edit Shopping Cart","Edit Shopping Cart"
-"Place Order","Place Order"
-"Submitting order information...","Submitting order information..."
-Item,Item
-Price,Price
-Qty,Qty
-Subtotal,Subtotal
-"Please update order data to get shipping methods and rates","Please update order data to get shipping methods and rates"
-or,or
-"Checkout with PayPal","Checkout with PayPal"
-"Please do not refresh the page until you complete payment.","Please do not refresh the page until you complete payment."
-"You will be required to enter your payment details after you place an order.","You will be required to enter your payment details after you place an order."
-Continue,Continue
-"Additional Options","Additional Options"
-"-- Please Select Billing Agreement--","-- Please Select Billing Agreement--"
-"Acceptance Mark","Acceptance Mark"
-"What is PayPal?","What is PayPal?"
-"Sign a billing agreement to streamline further purchases  with PayPal.","Sign a billing agreement to streamline further purchases  with PayPal."
-"Sign a billing agreement to streamline further purchases with PayPal.","Sign a billing agreement to streamline further purchases with PayPal."
-"Continue to PayPal","Continue to PayPal"
-"Save credit card information for future use.","Save credit card information for future use."
-"Sorry, something went wrong.","Sorry, something went wrong."
-"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
-"PayPal Section","PayPal Section"
-"PayPal Settlement","PayPal Settlement"
-Fetch,Fetch
-Actions,Actions
-Manage,Manage
-"Place Order Using Billing Agreements","Place Order Using Billing Agreements"
-"Merchant Location","Merchant Location"
-"Merchant Country","Merchant Country"
-"If not specified, Default Country from General Config will be used","If not specified, Default Country from General Config will be used"
-"Recommended Solutions:","Recommended Solutions:"
-"Other PayPal Payment Solutions:","Other PayPal Payment Solutions:"
-"Other Payment Methods:","Other Payment Methods:"
-"PayPal Express Checkout","PayPal Express Checkout"
-"Add another payment method to your existing solution or as a stand-alone option.","Add another payment method to your existing solution or as a stand-alone option."
-"PayPal All-in-One Payment Solutions&nbsp;<i>Accept and process credit cards and PayPal payments.</i>","PayPal All-in-One Payment Solutions&nbsp;<i>Accept and process credit cards and PayPal payments.</i>"
-"Choose a secure bundled payment solution for your business.","Choose a secure bundled payment solution for your business."
-"Payments Pro","Payments Pro"
-"Payments Pro and Express Checkout","Payments Pro and Express Checkout"
-"Basic Settings - PayPal Payments Pro","Basic Settings - PayPal Payments Pro"
-"PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>","PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>"
-"PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>","PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>"
-"Accept payments with a completely customizable checkout page.","Accept payments with a completely customizable checkout page."
-"Process payments using your own internet merchant account.","Process payments using your own internet merchant account."
-"Website Payments Pro","Website Payments Pro"
-"Express Checkout","Express Checkout"
-"Add PayPal as an additional payment method to your checkout page.","Add PayPal as an additional payment method to your checkout page."
-"Required PayPal Settings","Required PayPal Settings"
-"Email Associated with PayPal Merchant Account (Optional)","Email Associated with PayPal Merchant Account (Optional)"
+                "
+payflowpro,Payflow Pro
+Billing Agreements,Billing Agreements
+ID,ID
+Email,Email
+First Name,First Name
+Last Name,Last Name
+Reference ID,Reference ID
+Status,Status
+Created,Created
+N/A,N/A
+Updated,Updated
+Back,Back
+Are you sure you want to do this?,Are you sure you want to do this?
+Cancel,Cancel
+Billing Agreement #%1,Billing Agreement #%1
+General Information,General Information
+Related Orders,Related Orders
+Order,Order
+Purchased,Purchased
+Bill-to Name,Bill-to Name
+Ship-to Name,Ship-to Name
+Order Total,Order Total
+Purchase Point,Purchase Point
+Billing Agreement View,Billing Agreement View
+View Transaction Details,View Transaction Details
+Reference Information,Reference Information
+Transaction Information,Transaction Information
+PayPal Fee Information,PayPal Fee Information
+PayPal Settlement Reports,PayPal Settlement Reports
+We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?,We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?
+Fetch Updates,Fetch Updates
+button_label,button_label
+sandbox_button_label,sandbox_button_label
+Help,Help
+Configure,Configure
+Close,Close
+Learn More,Learn More
+View Demo,View Demo
+See terms,See terms
+You will be redirected to the PayPal website.,You will be redirected to the PayPal website.
+You will be redirected to the PayPal website when you place an order.,You will be redirected to the PayPal website when you place an order.
+Incl. Tax,Incl. Tax
+Billing Information,Billing Information
+Shipping Information,Shipping Information
+Invalid block type,Invalid block type
+Please specify the correct billing agreement ID and try again.,Please specify the correct billing agreement ID and try again.
+You canceled the billing agreement.,You canceled the billing agreement.
+We can't cancel the billing agreement.,We can't cancel the billing agreement.
+You deleted the billing agreement.,You deleted the billing agreement.
+We can't delete the billing agreement.,We can't delete the billing agreement.
+Reports,Reports
+Sales,Sales
+View Transaction,View Transaction
+We found nothing to fetch because of an empty configuration.,We found nothing to fetch because of an empty configuration.
+"We fetched %1 report rows from ""%2@%3.""","We fetched %1 report rows from ""%2@%3."""
+"We can't fetch reports from ""%1@%2.""","We can't fetch reports from ""%1@%2."""
+"The billing agreement ""%1"" has been canceled.","The billing agreement ""%1"" has been canceled."
+"The billing agreement ""%1"" has been created.","The billing agreement ""%1"" has been created."
+We couldn't finish the billing agreement wizard.,We couldn't finish the billing agreement wizard.
+We can't start the billing agreement wizard.,We can't start the billing agreement wizard.
+Billing Agreement # %1,Billing Agreement # %1
+We can't initialize Express Checkout.,We can't initialize Express Checkout.
+PayPal Express Checkout Token does not exist.,PayPal Express Checkout Token does not exist.
+A wrong PayPal Express Checkout Token is specified.,A wrong PayPal Express Checkout Token is specified.
+Express Checkout and Order have been canceled.,Express Checkout and Order have been canceled.
+Express Checkout has been canceled.,Express Checkout has been canceled.
+Unable to cancel Express Checkout,Unable to cancel Express Checkout
+Please agree to all the terms and conditions before placing the order.,Please agree to all the terms and conditions before placing the order.
+We can't place the order.,We can't place the order.
+We can't process Express Checkout approval.,We can't process Express Checkout approval.
+We can't initialize Express Checkout review.,We can't initialize Express Checkout review.
+We can't update shipping method.,We can't update shipping method.
+We can't start Express Checkout.,We can't start Express Checkout.
+"To check out, please sign in with your email address.","To check out, please sign in with your email address."
+"Sorry, but something went wrong","Sorry, but something went wrong"
+Your payment has been declined. Please try again.,Your payment has been declined. Please try again.
+Requested payment method does not match with order.,Requested payment method does not match with order.
+Would you like to sign a billing agreement to streamline further purchases with PayPal?,Would you like to sign a billing agreement to streamline further purchases with PayPal?
+"Error processing payment, please try again later.","Error processing payment, please try again later."
+Payment Gateway is unreachable at the moment. Please use another payment option.,Payment Gateway is unreachable at the moment. Please use another payment option.
+PayPal response hasn't required fields.,PayPal response hasn't required fields.
+Something went wrong while processing your order.,Something went wrong while processing your order.
+PayPal gateway has rejected request. %1,PayPal gateway has rejected request. %1
+The PayPal gateway rejected the request. %1,The PayPal gateway rejected the request. %1
+I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.,I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.
+I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.,I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.
+"A match of the Shipping Address City, State, and Postal Code failed.","A match of the Shipping Address City, State, and Postal Code failed."
+The payment method code is not set.,The payment method code is not set.
+The reference ID is not set.,The reference ID is not set.
+Unable to save Billing Agreement:,Unable to save Billing Agreement:
+Active,Active
+Canceled,Canceled
+The customer ID is not set.,The customer ID is not set.
+The Billing Agreement status is not set.,The Billing Agreement status is not set.
+The PayPal certificate does not exist.,The PayPal certificate does not exist.
+We prefer PayPal (150 X 60),We prefer PayPal (150 X 60)
+We prefer PayPal (150 X 40),We prefer PayPal (150 X 40)
+Now accepting PayPal (150 X 60),Now accepting PayPal (150 X 60)
+Now accepting PayPal (150 X 40),Now accepting PayPal (150 X 40)
+Payments by PayPal (150 X 60),Payments by PayPal (150 X 60)
+Payments by PayPal (150 X 40),Payments by PayPal (150 X 40)
+Shop now using (150 X 60),Shop now using (150 X 60)
+Shop now using (150 X 40),Shop now using (150 X 40)
+Dynamic,Dynamic
+Static,Static
+Shortcut,Shortcut
+Acceptance Mark Image,Acceptance Mark Image
+Authorization,Authorization
+Sale,Sale
+Yes,Yes
+No,No
+For Virtual Quotes Only,For Virtual Quotes Only
+Auto,Auto
+Ask Customer,Ask Customer
+Never,Never
+IPN (Instant Payment Notification) Only,IPN (Instant Payment Notification) Only
+API Signature,API Signature
+API Certificate,API Certificate
+The ordering amount of %1 is pending approval on the payment gateway.,The ordering amount of %1 is pending approval on the payment gateway.
+Ordered amount of %1,Ordered amount of %1
+We'll authorize the amount of %1 as soon as the payment gateway approves it.,We'll authorize the amount of %1 as soon as the payment gateway approves it.
+The authorized amount is %1.,The authorized amount is %1.
+The maximum number of child authorizations is reached.,The maximum number of child authorizations is reached.
+"PayPal can't process orders with a zero balance due. To finish your purchase, please go through the standard checkout process.","PayPal can't process orders with a zero balance due. To finish your purchase, please go through the standard checkout process."
+A payer is not identified.,A payer is not identified.
+Cannot get secure form URL from PayPal,Cannot get secure form URL from PayPal
+Last Transaction ID,Last Transaction ID
+This customer didn't include a confirmed address.,This customer didn't include a confirmed address.
+The payment is authorized but not settled.,The payment is authorized but not settled.
+The payment eCheck is not cleared.,The payment eCheck is not cleared.
+The merchant holds a non-U.S. account and doesn't have a withdrawal mechanism.,The merchant holds a non-U.S. account and doesn't have a withdrawal mechanism.
+The payment currency doesn't match any of the merchant's balances currency.,The payment currency doesn't match any of the merchant's balances currency.
+The payment is pending while it is being reviewed by PayPal for risk.,The payment is pending while it is being reviewed by PayPal for risk.
+The payment is pending because it was made to an email address that is not yet registered or confirmed.,The payment is pending because it was made to an email address that is not yet registered or confirmed.
+The merchant account is not yet verified.,The merchant account is not yet verified.
+The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.,The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.
+"Sorry, but something went wrong. Please contact PayPal customer service.","Sorry, but something went wrong. Please contact PayPal customer service."
+A reversal has occurred on this transaction due to a chargeback by your customer.,A reversal has occurred on this transaction due to a chargeback by your customer.
+A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.,A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.
+A reversal has occurred on this transaction due to a complaint about the transaction from your customer.,A reversal has occurred on this transaction due to a complaint about the transaction from your customer.
+A reversal has occurred on this transaction because you have given the customer a refund.,A reversal has occurred on this transaction because you have given the customer a refund.
+Reversal of an adjustment.,Reversal of an adjustment.
+Transaction reversal due to fraud detected by PayPal administrators.,Transaction reversal due to fraud detected by PayPal administrators.
+Transaction reversal by PayPal administrators.,Transaction reversal by PayPal administrators.
+Reimbursement for a chargeback.,Reimbursement for a chargeback.
+Settlement of a chargeback.,Settlement of a chargeback.
+A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.,A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.
+Buyer claims that he did not receive goods or service.,Buyer claims that he did not receive goods or service.
+Buyer claims that the goods or service received differ from merchant’s description of the goods or service.,Buyer claims that the goods or service received differ from merchant’s description of the goods or service.
+Buyer claims that he/she did not authorize transaction.,Buyer claims that he/she did not authorize transaction.
+A case that has been resolved and close requires a reimbursement.,A case that has been resolved and close requires a reimbursement.
+Buyer claims that a possible duplicate payment was made to the merchant.,Buyer claims that a possible duplicate payment was made to the merchant.
+"Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.","Buyer claims that the received merchandise is unsatisfactory, defective, or damaged."
+Unknown reason. Please contact PayPal customer service.,Unknown reason. Please contact PayPal customer service.
+Payer ID,Payer ID
+Payer Email,Payer Email
+Payer Status,Payer Status
+Payer Address ID,Payer Address ID
+Payer Address Status,Payer Address Status
+Merchant Protection Eligibility,Merchant Protection Eligibility
+Triggered Fraud Filters,Triggered Fraud Filters
+Last Correlation ID,Last Correlation ID
+Address Verification System Response,Address Verification System Response
+CVV2 Check Result by PayPal,CVV2 Check Result by PayPal
+AVS Street Match,AVS Street Match
+AVS zip,AVS zip
+International AVS response,International AVS response
+Buyer's Tax ID,Buyer's Tax ID
+Buyer's Tax ID Type,Buyer's Tax ID Type
+Chargeback,Chargeback
+Complaint,Complaint
+Dispute,Dispute
+Matched Address only (no ZIP),Matched Address only (no ZIP)
+Matched Address only (no ZIP) International,Matched Address only (no ZIP) International
+No Details matched,No Details matched
+No Details matched. International,No Details matched. International
+Exact Match.,Exact Match.
+Exact Match. Address and Postal Code. International,Exact Match. Address and Postal Code. International
+Exact Match. Address and Postal Code. UK-specific,Exact Match. Address and Postal Code. UK-specific
+N/A. Not allowed for MOTO (Internet/Phone) transactions,N/A. Not allowed for MOTO (Internet/Phone) transactions
+N/A. Global Unavailable,N/A. Global Unavailable
+N/A. International Unavailable,N/A. International Unavailable
+Matched five-digit ZIP only (no Address),Matched five-digit ZIP only (no Address)
+Matched Postal Code only (no Address),Matched Postal Code only (no Address)
+N/A. Retry,N/A. Retry
+N/A. Service not Supported,N/A. Service not Supported
+N/A. Unavailable,N/A. Unavailable
+Matched whole nine-digit ZIP (no Address),Matched whole nine-digit ZIP (no Address)
+Yes. Matched Address and five-digit ZIP,Yes. Matched Address and five-digit ZIP
+All the address information matched,All the address information matched
+None of the address information matched,None of the address information matched
+Part of the address information matched,Part of the address information matched
+N/A. The merchant did not provide AVS information,N/A. The merchant did not provide AVS information
+"N/A. Address not checked, or acquirer had no response. Service not available","N/A. Address not checked, or acquirer had no response. Service not available"
+Matched (CVV2CSC),Matched (CVV2CSC)
+No match,No match
+N/A. Not processed,N/A. Not processed
+N/A. Service not supported,N/A. Service not supported
+N/A. Service not available,N/A. Service not available
+N/A. No response,N/A. No response
+Matched (CVV2),Matched (CVV2)
+N/A. The merchant has not implemented CVV2 code handling,N/A. The merchant has not implemented CVV2 code handling
+N/A. Merchant has indicated that CVV2 is not present on card,N/A. Merchant has indicated that CVV2 is not present on card
+CNPJ,CNPJ
+CPF,CPF
+Note: %1,Note: %1
+"IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4","IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4"
+"IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3.","IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3."
+You notified customer about invoice #%1.,You notified customer about invoice #%1.
+We cannot cancel this order.,We cannot cancel this order.
+"IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4""","IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4"""
+You notified customer about creditmemo #%1.,You notified customer about creditmemo #%1.
+"IPN ""%1""","IPN ""%1"""
+Payflow PNREF: #%1.,Payflow PNREF: #%1.
+Unable to fetch transaction details.,Unable to fetch transaction details.
+Invalid method %1::%2,Invalid method %1::%2
+Transaction has been declined,Transaction has been declined
+Error processing payment. Please try again later.,Error processing payment. Please try again later.
+We cannot send the new order email.,We cannot send the new order email.
+Payment error. %value was not found.,Payment error. %value was not found.
+You cannot void a verification transaction.,You cannot void a verification transaction.
+You need an authorization transaction to void.,You need an authorization transaction to void.
+We can't issue a refund transaction because there is no capture transaction.,We can't issue a refund transaction because there is no capture transaction.
+We cannot create a target file for reading reports.,We cannot create a target file for reading reports.
+Report Date,Report Date
+Merchant Account,Merchant Account
+Transaction ID,Transaction ID
+Invoice ID,Invoice ID
+PayPal Reference ID,PayPal Reference ID
+PayPal Reference ID Type,PayPal Reference ID Type
+Event Code,Event Code
+Event,Event
+Start Date,Start Date
+Finish Date,Finish Date
+Debit or Credit,Debit or Credit
+Gross Amount,Gross Amount
+Fee Debit or Credit,Fee Debit or Credit
+Fee Amount,Fee Amount
+Custom,Custom
+Order ID,Order ID
+Preapproved Payment ID,Preapproved Payment ID
+Subscription ID,Subscription ID
+Credit,Credit
+Debit,Debit
+ACH Deposit (Hold for Dispute or Other Investigation),ACH Deposit (Hold for Dispute or Other Investigation)
+ACH Deposit (Reversal),ACH Deposit (Reversal)
+ACH Funding for Funds Recovery from Account Balance,ACH Funding for Funds Recovery from Account Balance
+ACH Withdrawal,ACH Withdrawal
+"Account-to-Account Payment, initiated by PayPal","Account-to-Account Payment, initiated by PayPal"
+Auction Payment other than through eBay,Auction Payment other than through eBay
+AutoSweep,AutoSweep
+Available Balance,Available Balance
+Balance Manager Account Bonus,Balance Manager Account Bonus
+Bonus for first ACH Use,Bonus for first ACH Use
+Buyer Credit Payment,Buyer Credit Payment
+Charge-off,Charge-off
+Coupon Redemption,Coupon Redemption
+Currency Conversion required to cover negative balance,Currency Conversion required to cover negative balance
+Debit Card Cash Back,Debit Card Cash Back
+Debit Card Transaction,Debit Card Transaction
+Direct Payment API,Direct Payment API
+EFT Funding (German banking),EFT Funding (German banking)
+Express Checkout APIs,Express Checkout APIs
+Fee Reversal,Fee Reversal
+Fee: Foreign ACH Withdrawal,Fee: Foreign ACH Withdrawal
+Fee: Mass Pay Request,Fee: Mass Pay Request
+Fee: Web Site Payments Pro Account Monthly,Fee: Web Site Payments Pro Account Monthly
+Fee: WorldLink Check Withdrawal,Fee: WorldLink Check Withdrawal
+Funding,Funding
+General (Authorization),General (Authorization)
+General (Dividend),General (Dividend)
+General (Funds Transfer from PayPal Account to Another),General (Funds Transfer from PayPal Account to Another)
+General (Purchase with a credit card),General (Purchase with a credit card)
+General Adjustment without businessrelated event,General Adjustment without businessrelated event
+General Currency Conversion,General Currency Conversion
+General Funding of PayPal Account ,General Funding of PayPal Account 
+General Redemption,General Redemption
+General Withdrawal from PayPal Account,General Withdrawal from PayPal Account
+General. Product no longer supported,General. Product no longer supported
+General: Use of PayPal account for purchasing as well as receiving payments,General: Use of PayPal account for purchasing as well as receiving payments
+General: Withdrawal from PayPal Account,General: Withdrawal from PayPal Account
+General: Withdrawal to Non-Bank Entity,General: Withdrawal to Non-Bank Entity
+General: adjustment of a type not belonging to the other T12xx categories,General: adjustment of a type not belonging to the other T12xx categories
+General: bonus of a type not belonging to the other T08xx categories,General: bonus of a type not belonging to the other T08xx categories
+General: event not yet categorized,General: event not yet categorized
+General: non-payment fee of a type not belonging to the other T01xx categories,General: non-payment fee of a type not belonging to the other T01xx categories
+General: received payment of a type not belonging to the other T00xx categories,General: received payment of a type not belonging to the other T00xx categories
+General: reversal of a type not belonging to the other T11xx categories,General: reversal of a type not belonging to the other T11xx categories
+General: temporary hold of a type not belonging to the other T15xx categories,General: temporary hold of a type not belonging to the other T15xx categories
+Gift Certificate Payment: purchase of Gift Certificate,Gift Certificate Payment: purchase of Gift Certificate
+Gift Certificate Redemption,Gift Certificate Redemption
+Hidden Virtual PayPal Debit Card Transaction,Hidden Virtual PayPal Debit Card Transaction
+Hold for Dispute Investigation,Hold for Dispute Investigation
+Incentive,Incentive
+Mass Pay Payment,Mass Pay Payment
+Merchant Referral Bonus,Merchant Referral Bonus
+Mobile Payment (made via a mobile phone),Mobile Payment (made via a mobile phone)
+Negative Balance,Negative Balance
+Open Authorization,Open Authorization
+PayPal Balance Manager function of PayPal account,PayPal Balance Manager function of PayPal account
+PayPal Buyer Warranty Bonus,PayPal Buyer Warranty Bonus
+PayPal Debit Card Cash Advance,PayPal Debit Card Cash Advance
+PayPal Debit Card Withdrawal from ATM,PayPal Debit Card Withdrawal from ATM
+PayPal Protection Bonus,PayPal Protection Bonus
+Payment Refund initiated by merchant,Payment Refund initiated by merchant
+Points Incentive Redemption,Points Incentive Redemption
+Postage Payment to either USPS or UPS,Postage Payment to either USPS or UPS
+"Preapproved Payment (BillUser API, either sent or received","Preapproved Payment (BillUser API, either sent or received"
+Reauthorization,Reauthorization
+Reimbursement of Chargeback,Reimbursement of Chargeback
+Reversal,Reversal
+Reversal of General Account Hold,Reversal of General Account Hold
+Reversal of Points Usage,Reversal of Points Usage
+Reversal of hold for Dispute Investigation,Reversal of hold for Dispute Investigation
+Reward Voucher Redemption,Reward Voucher Redemption
+Settlement Consolidation,Settlement Consolidation
+"Subscription Payment, either payment sent or payment received","Subscription Payment, either payment sent or payment received"
+User-initiated Currency Conversion,User-initiated Currency Conversion
+Virtual PayPal Debit Card Transaction,Virtual PayPal Debit Card Transaction
+Virtual Terminal Payment,Virtual Terminal Payment
+Void,Void
+WorldLink Withdrawal,WorldLink Withdrawal
+eBay Auction Payment,eBay Auction Payment
+The PayPal certificate file is empty.,The PayPal certificate file is empty.
+Header (center),Header (center)
+Sidebar (right),Sidebar (right)
+Near PayPal Credit checkout button,Near PayPal Credit checkout button
+--Please Select--,--Please Select--
+Daily,Daily
+Every 3 days,Every 3 days
+Every 7 days,Every 7 days
+Every 10 days,Every 10 days
+Every 14 days,Every 14 days
+Every 30 days,Every 30 days
+Every 40 days,Every 40 days
+No Logo,No Logo
+Yes (PayPal recommends this option),Yes (PayPal recommends this option)
+Created billing agreement #%1.,Created billing agreement #%1.
+We can't create a billing agreement for this order.,We can't create a billing agreement for this order.
+Pending PayPal,Pending PayPal
+PayPal Reversed,PayPal Reversed
+PayPal Canceled Reversal,PayPal Canceled Reversal
+Error,Error
+Billing Agreement,Billing Agreement
+Please Select,Please Select
+Customer,Customer
+Created At,Created At
+Updated At,Updated At
+ending,ending
+expires,expires
+Not sure what PayPal payment method to use? Click ,Not sure what PayPal payment method to use? Click 
+here,here
+ to learn more., to learn more.
+Important: ,Important: 
+"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website."
+"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
+"To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.","To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website."
+"Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
+Credit Card Type,Credit Card Type
+Credit Card Number,Credit Card Number
+Expiration Date,Expiration Date
+Card Verification Number,Card Verification Number
+Billing Agreement # ,Billing Agreement # 
+Agreement Information,Agreement Information
+Reference ID:,Reference ID:
+Status:,Status:
+Created:,Created:
+Updated:,Updated:
+Payment Method:,Payment Method:
+Order #,Order #
+Date,Date
+Ship To,Ship To
+Order Status,Order Status
+View Order,View Order
+Back to Billing Agreements,Back to Billing Agreements
+Payment Method,Payment Method
+View,View
+There are no billing agreements yet.,There are no billing agreements yet.
+New Billing Agreement,New Billing Agreement
+You will be redirected to the payment system website.,You will be redirected to the payment system website.
+-- Please Select --,-- Please Select --
+Create...,Create...
+Your credit card will be charged for,Your credit card will be charged for
+Your billing agreement # is: ,Your billing agreement # is: 
+Shipping Method,Shipping Method
+Please select a shipping method...,Please select a shipping method...
+Update Shipping Method,Update Shipping Method
+"Sorry, no quotes are available for this order right now.","Sorry, no quotes are available for this order right now."
+Shipping Address,Shipping Address
+Edit,Edit
+Buy now with PayPal,Buy now with PayPal
+Edit Payment Information,Edit Payment Information
+Items in Your Shopping Cart,Items in Your Shopping Cart
+Edit Shopping Cart,Edit Shopping Cart
+Place Order,Place Order
+Submitting order information...,Submitting order information...
+Item,Item
+Price,Price
+Qty,Qty
+Subtotal,Subtotal
+Please update order data to get shipping methods and rates,Please update order data to get shipping methods and rates
+or,or
+Checkout with PayPal,Checkout with PayPal
+Please do not refresh the page until you complete payment.,Please do not refresh the page until you complete payment.
+You will be required to enter your payment details after you place an order.,You will be required to enter your payment details after you place an order.
+Continue,Continue
+Additional Options,Additional Options
+-- Please Select Billing Agreement--,-- Please Select Billing Agreement--
+Acceptance Mark,Acceptance Mark
+What is PayPal?,What is PayPal?
+Sign a billing agreement to streamline further purchases  with PayPal.,Sign a billing agreement to streamline further purchases  with PayPal.
+Sign a billing agreement to streamline further purchases with PayPal.,Sign a billing agreement to streamline further purchases with PayPal.
+Continue to PayPal,Continue to PayPal
+Save credit card information for future use.,Save credit card information for future use.
+"Sorry, something went wrong.","Sorry, something went wrong."
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+PayPal Section,PayPal Section
+PayPal Settlement,PayPal Settlement
+Fetch,Fetch
+Actions,Actions
+Manage,Manage
+Place Order Using Billing Agreements,Place Order Using Billing Agreements
+Merchant Location,Merchant Location
+Merchant Country,Merchant Country
+"If not specified, Default Country from General Config will be used","If not specified, Default Country from General Config will be used"
+Recommended Solutions:,Recommended Solutions:
+Other PayPal Payment Solutions:,Other PayPal Payment Solutions:
+Other Payment Methods:,Other Payment Methods:
+PayPal Express Checkout,PayPal Express Checkout
+Add another payment method to your existing solution or as a stand-alone option.,Add another payment method to your existing solution or as a stand-alone option.
+PayPal All-in-One Payment Solutions&nbsp;<i>Accept and process credit cards and PayPal payments.</i>,PayPal All-in-One Payment Solutions&nbsp;<i>Accept and process credit cards and PayPal payments.</i>
+Choose a secure bundled payment solution for your business.,Choose a secure bundled payment solution for your business.
+Payments Pro,Payments Pro
+Payments Pro and Express Checkout,Payments Pro and Express Checkout
+Basic Settings - PayPal Payments Pro,Basic Settings - PayPal Payments Pro
+PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>,PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>
+PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>,PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>
+Accept payments with a completely customizable checkout page.,Accept payments with a completely customizable checkout page.
+Process payments using your own internet merchant account.,Process payments using your own internet merchant account.
+Website Payments Pro,Website Payments Pro
+Express Checkout,Express Checkout
+Add PayPal as an additional payment method to your checkout page.,Add PayPal as an additional payment method to your checkout page.
+Required PayPal Settings,Required PayPal Settings
+Email Associated with PayPal Merchant Account (Optional),Email Associated with PayPal Merchant Account (Optional)
 "
                         <a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>
                     ","
                         <a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>
-                    "
-"Don't have a PayPal account? Simply enter your email address.","Don't have a PayPal account? Simply enter your email address."
-"API Authentication Methods","API Authentication Methods"
-"API Username","API Username"
-"API Password","API Password"
-"Get Credentials from PayPal","Get Credentials from PayPal"
-"Sandbox Mode","Sandbox Mode"
-"API Uses Proxy","API Uses Proxy"
-"Proxy Host","Proxy Host"
-"Proxy Port","Proxy Port"
-"Enable this Solution","Enable this Solution"
-"Enable In-Context Checkout Experience","Enable In-Context Checkout Experience"
+                    "
+Don't have a PayPal account? Simply enter your email address.,Don't have a PayPal account? Simply enter your email address.
+API Authentication Methods,API Authentication Methods
+API Username,API Username
+API Password,API Password
+Get Credentials from PayPal,Get Credentials from PayPal
+Sandbox Mode,Sandbox Mode
+Buyer Country,Buyer Country
+API Uses Proxy,API Uses Proxy
+Proxy Host,Proxy Host
+Proxy Port,Proxy Port
+Enable this Solution,Enable this Solution
+Enable In-Context Checkout Experience,Enable In-Context Checkout Experience
 "
                     See PayPal Feature Support details and list of supported regions
                     <a href=""https://developer.paypal.com/docs/classic/express-checkout/in-context/"" target=""_blank"">here</a>.
                 ","
                     See PayPal Feature Support details and list of supported regions
                     <a href=""https://developer.paypal.com/docs/classic/express-checkout/in-context/"" target=""_blank"">here</a>.
-                "
-"Merchant Account ID","Merchant Account ID"
-"Enable PayPal Credit","Enable PayPal Credit"
+                "
+Merchant Account ID,Merchant Account ID
+Enable PayPal Credit,Enable PayPal Credit
 "PayPal Express Checkout lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
                         <a href=""https://www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
                 ","PayPal Express Checkout lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
                         <a href=""https://www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
-                "
-"Sort Order PayPal Credit","Sort Order PayPal Credit"
-"Advertise PayPal Credit","Advertise PayPal Credit"
+                "
+Sort Order PayPal Credit,Sort Order PayPal Credit
+Advertise PayPal Credit,Advertise PayPal Credit
 "
                     <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
                         <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
@@ -505,114 +506,114 @@ Manage,Manage
                         Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                         The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
                         or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
-                "
-"Publisher ID","Publisher ID"
-"Required to display a banner","Required to display a banner"
-"Get Publisher ID from PayPal","Get Publisher ID from PayPal"
-"Home Page","Home Page"
-Display,Display
-Position,Position
-Size,Size
-"Catalog Category Page","Catalog Category Page"
-"Catalog Product Page","Catalog Product Page"
-"Checkout Cart Page","Checkout Cart Page"
-"Basic Settings - PayPal Express Checkout","Basic Settings - PayPal Express Checkout"
-Title,Title
-"It is recommended to set this value to ""PayPal"" per store views.","It is recommended to set this value to ""PayPal"" per store views."
-"Sort Order","Sort Order"
-"Payment Action","Payment Action"
-"Display on Product Details Page","Display on Product Details Page"
-"Authorization Honor Period (days)","Authorization Honor Period (days)"
-"Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal."
-"Order Valid Period (days)","Order Valid Period (days)"
-"Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal."
-"Number of Child Authorizations","Number of Child Authorizations"
-"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase."
-"Advanced Settings","Advanced Settings"
-"Display on Shopping Cart","Display on Shopping Cart"
-"Also affects mini-shopping cart.","Also affects mini-shopping cart."
-"Payment Applicable From","Payment Applicable From"
-"Countries Payment Applicable From","Countries Payment Applicable From"
-"Debug Mode","Debug Mode"
-"Enable SSL verification","Enable SSL verification"
-"Transfer Cart Line Items","Transfer Cart Line Items"
-"Transfer Shipping Options","Transfer Shipping Options"
-"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only."
-"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available."
-"Shortcut Buttons Flavor","Shortcut Buttons Flavor"
-"Enable PayPal Guest Checkout","Enable PayPal Guest Checkout"
-"Ability for buyer to purchase without PayPal account.","Ability for buyer to purchase without PayPal account."
-"Require Customer's Billing Address","Require Customer's Billing Address"
-"This feature needs be enabled first for the merchant account through PayPal technical support.","This feature needs be enabled first for the merchant account through PayPal technical support."
-"Billing Agreement Signup","Billing Agreement Signup"
-"Whether to create a billing agreement, if there are no active billing agreements available.","Whether to create a billing agreement, if there are no active billing agreements available."
+                "
+Publisher ID,Publisher ID
+Required to display a banner,Required to display a banner
+Get Publisher ID from PayPal,Get Publisher ID from PayPal
+Home Page,Home Page
+Display,Display
+Position,Position
+Size,Size
+Catalog Category Page,Catalog Category Page
+Catalog Product Page,Catalog Product Page
+Checkout Cart Page,Checkout Cart Page
+Basic Settings - PayPal Express Checkout,Basic Settings - PayPal Express Checkout
+Title,Title
+"It is recommended to set this value to ""PayPal"" per store views.","It is recommended to set this value to ""PayPal"" per store views."
+Sort Order,Sort Order
+Payment Action,Payment Action
+Display on Product Details Page,Display on Product Details Page
+Authorization Honor Period (days),Authorization Honor Period (days)
+Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.,Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.
+Order Valid Period (days),Order Valid Period (days)
+Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.,Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.
+Number of Child Authorizations,Number of Child Authorizations
+The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.,The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.
+Advanced Settings,Advanced Settings
+Display on Shopping Cart,Display on Shopping Cart
+Also affects mini-shopping cart.,Also affects mini-shopping cart.
+Payment Applicable From,Payment Applicable From
+Countries Payment Applicable From,Countries Payment Applicable From
+Debug Mode,Debug Mode
+Enable SSL verification,Enable SSL verification
+Transfer Cart Line Items,Transfer Cart Line Items
+Transfer Shipping Options,Transfer Shipping Options
+"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only."
+Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.,Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.
+Shortcut Buttons Flavor,Shortcut Buttons Flavor
+Enable PayPal Guest Checkout,Enable PayPal Guest Checkout
+Ability for buyer to purchase without PayPal account.,Ability for buyer to purchase without PayPal account.
+Require Customer's Billing Address,Require Customer's Billing Address
+This feature needs be enabled first for the merchant account through PayPal technical support.,This feature needs be enabled first for the merchant account through PayPal technical support.
+Billing Agreement Signup,Billing Agreement Signup
+"Whether to create a billing agreement, if there are no active billing agreements available.","Whether to create a billing agreement, if there are no active billing agreements available."
 "
                         Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.
                     ","
                         Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.
-                    "
-"Skip Order Review Step","Skip Order Review Step"
-"PayPal Billing Agreement Settings","PayPal Billing Agreement Settings"
-Enabled,Enabled
+                    "
+Skip Order Review Step,Skip Order Review Step
+PayPal Billing Agreement Settings,PayPal Billing Agreement Settings
+Enabled,Enabled
 "
                             Will appear as a payment option only for customers who have at least one active billing agreement.
                         ","
                             Will appear as a payment option only for customers who have at least one active billing agreement.
-                        "
-"Allow in Billing Agreement Wizard","Allow in Billing Agreement Wizard"
-"Settlement Report Settings","Settlement Report Settings"
-"SFTP Credentials","SFTP Credentials"
-Login,Login
-Password,Password
-"Custom Endpoint Hostname or IP-Address","Custom Endpoint Hostname or IP-Address"
-"By default it is ""reports.paypal.com"".","By default it is ""reports.paypal.com""."
-"Use colon to specify port. For example: ""test.example.com:5224"".","Use colon to specify port. For example: ""test.example.com:5224""."
-"Custom Path","Custom Path"
-"Scheduled Fetching","Scheduled Fetching"
-"Enable Automatic Fetching","Enable Automatic Fetching"
-Schedule,Schedule
-"PayPal retains reports for 45 days.","PayPal retains reports for 45 days."
-"Time of Day","Time of Day"
-"Frontend Experience Settings","Frontend Experience Settings"
-"PayPal Product Logo","PayPal Product Logo"
-"Displays on catalog pages and homepage.","Displays on catalog pages and homepage."
-"PayPal Merchant Pages Style","PayPal Merchant Pages Style"
-"Page Style","Page Style"
+                        "
+Allow in Billing Agreement Wizard,Allow in Billing Agreement Wizard
+Settlement Report Settings,Settlement Report Settings
+SFTP Credentials,SFTP Credentials
+Login,Login
+Password,Password
+Custom Endpoint Hostname or IP-Address,Custom Endpoint Hostname or IP-Address
+"By default it is ""reports.paypal.com"".","By default it is ""reports.paypal.com""."
+"Use colon to specify port. For example: ""test.example.com:5224"".","Use colon to specify port. For example: ""test.example.com:5224""."
+Custom Path,Custom Path
+Scheduled Fetching,Scheduled Fetching
+Enable Automatic Fetching,Enable Automatic Fetching
+Schedule,Schedule
+PayPal retains reports for 45 days.,PayPal retains reports for 45 days.
+Time of Day,Time of Day
+Frontend Experience Settings,Frontend Experience Settings
+PayPal Product Logo,PayPal Product Logo
+Displays on catalog pages and homepage.,Displays on catalog pages and homepage.
+PayPal Merchant Pages Style,PayPal Merchant Pages Style
+Page Style,Page Style
 "
                             Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).
                         ","
                             Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).
-                        "
-"Header Image URL","Header Image URL"
+                        "
+Header Image URL,Header Image URL
 "
                             The image at the top left of the checkout page. Max size is 750x90-pixel. <strong class=""colorRed"">https</strong> is highly encouraged.
                         ","
                             The image at the top left of the checkout page. Max size is 750x90-pixel. <strong class=""colorRed"">https</strong> is highly encouraged.
-                        "
-"Header Background Color","Header Background Color"
+                        "
+Header Background Color,Header Background Color
 "
                             The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.
                         ","
                             The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.
-                        "
-"Header Border Color","Header Border Color"
-"2-pixel perimeter around the header space.","2-pixel perimeter around the header space."
-"Page Background Color","Page Background Color"
+                        "
+Header Border Color,Header Border Color
+2-pixel perimeter around the header space.,2-pixel perimeter around the header space.
+Page Background Color,Page Background Color
 "
                             The background color for the checkout page around the header and payment form.
                         ","
                             The background color for the checkout page around the header and payment form.
-                        "
-"Payments Advanced","Payments Advanced"
-"Accept payments with a PCI-compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)","Accept payments with a PCI-compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)"
-"Payments Advanced and Express Checkout","Payments Advanced and Express Checkout"
-Partner,Partner
-Vendor,Vendor
-User,User
-"PayPal recommends that you set up an additional User on your account at manager.paypal.com","PayPal recommends that you set up an additional User on your account at manager.paypal.com"
-"PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.","PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here."
-"Test Mode","Test Mode"
-"Use Proxy","Use Proxy"
+                        "
+Payments Advanced,Payments Advanced
+Accept payments with a PCI-compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>),Accept payments with a PCI-compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)
+Payments Advanced and Express Checkout,Payments Advanced and Express Checkout
+Partner,Partner
+Vendor,Vendor
+User,User
+PayPal recommends that you set up an additional User on your account at manager.paypal.com,PayPal recommends that you set up an additional User on your account at manager.paypal.com
+"PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.","PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here."
+Test Mode,Test Mode
+Use Proxy,Use Proxy
 "
                     <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
                                             <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
@@ -627,23 +628,23 @@ User,User
                                             Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                                             The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
                                             or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
-                "
-"Basic Settings - PayPal Payments Advanced","Basic Settings - PayPal Payments Advanced"
-"It is recommended to set this value to ""Debit or Credit Card"" per store views.","It is recommended to set this value to ""Debit or Credit Card"" per store views."
-"CVV Entry is Editable","CVV Entry is Editable"
-"Require CVV Entry","Require CVV Entry"
-"Send Email Confirmation","Send Email Confirmation"
-"URL method for Cancel URL and Return URL","URL method for Cancel URL and Return URL"
-"Payflow Link","Payflow Link"
-"Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)","Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)"
-"Payflow Link and Express Checkout","Payflow Link and Express Checkout"
-"If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.","If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here."
-"Enable Payflow Link","Enable Payflow Link"
-"Enable Express Checkout","Enable Express Checkout"
-"Basic Settings - PayPal Payflow Link","Basic Settings - PayPal Payflow Link"
-"Website Payments Pro Hosted Solution","Website Payments Pro Hosted Solution"
-"Accept payments with a PCI compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)","Accept payments with a PCI compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)"
-"Payments Pro Hosted Solution","Payments Pro Hosted Solution"
+                "
+Basic Settings - PayPal Payments Advanced,Basic Settings - PayPal Payments Advanced
+"It is recommended to set this value to ""Debit or Credit Card"" per store views.","It is recommended to set this value to ""Debit or Credit Card"" per store views."
+CVV Entry is Editable,CVV Entry is Editable
+Require CVV Entry,Require CVV Entry
+Send Email Confirmation,Send Email Confirmation
+URL method for Cancel URL and Return URL,URL method for Cancel URL and Return URL
+Payflow Link,Payflow Link
+Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>),Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)
+Payflow Link and Express Checkout,Payflow Link and Express Checkout
+"If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.","If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here."
+Enable Payflow Link,Enable Payflow Link
+Enable Express Checkout,Enable Express Checkout
+Basic Settings - PayPal Payflow Link,Basic Settings - PayPal Payflow Link
+Website Payments Pro Hosted Solution,Website Payments Pro Hosted Solution
+Accept payments with a PCI compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>),Accept payments with a PCI compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)
+Payments Pro Hosted Solution,Payments Pro Hosted Solution
 "
                     <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
                             <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
@@ -658,30 +659,30 @@ User,User
                             Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                             The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
                             or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
-                "
-"Basic Settings - PayPal Payments Pro Hosted Solution","Basic Settings - PayPal Payments Pro Hosted Solution"
-"Display Express Checkout in the Payment Information step","Display Express Checkout in the Payment Information step"
-"Website Payments Pro Hosted Solution and Express Checkout","Website Payments Pro Hosted Solution and Express Checkout"
-"Basic Settings - PayPal Website Payments Pro Hosted Solution","Basic Settings - PayPal Website Payments Pro Hosted Solution"
-"Payflow Pro","Payflow Pro"
-"Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)","Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)"
-"Vault Enabled","Vault Enabled"
-"Basic Settings - PayPal Payflow Pro","Basic Settings - PayPal Payflow Pro"
-"Vault Title","Vault Title"
-"Credit Card Settings","Credit Card Settings"
-"Allowed Credit Card Types","Allowed Credit Card Types"
+                "
+Basic Settings - PayPal Payments Pro Hosted Solution,Basic Settings - PayPal Payments Pro Hosted Solution
+Display Express Checkout in the Payment Information step,Display Express Checkout in the Payment Information step
+Website Payments Pro Hosted Solution and Express Checkout,Website Payments Pro Hosted Solution and Express Checkout
+Basic Settings - PayPal Website Payments Pro Hosted Solution,Basic Settings - PayPal Website Payments Pro Hosted Solution
+Payflow Pro,Payflow Pro
+Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>),Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)
+Vault Enabled,Vault Enabled
+Basic Settings - PayPal Payflow Pro,Basic Settings - PayPal Payflow Pro
+Vault Title,Vault Title
+Credit Card Settings,Credit Card Settings
+Allowed Credit Card Types,Allowed Credit Card Types
 "
                     Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
                 ","
                     Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
-                "
-"CVV and AVS Settings","CVV and AVS Settings"
-"Reject Transaction if:","Reject Transaction if:"
-"AVS Street Does Not Match","AVS Street Does Not Match"
-"AVS Zip Does Not Match","AVS Zip Does Not Match"
-"Card Issuer Is Outside The United States","Card Issuer Is Outside The United States"
-"Card Security Code Does Not Match","Card Security Code Does Not Match"
-"Payflow Pro and Express Checkout","Payflow Pro and Express Checkout"
+                "
+CVV and AVS Settings,CVV and AVS Settings
+Reject Transaction if:,Reject Transaction if:
+AVS Street Does Not Match,AVS Street Does Not Match
+AVS Zip Does Not Match,AVS Zip Does Not Match
+Card Issuer Is Outside The United States,Card Issuer Is Outside The United States
+Card Security Code Does Not Match,Card Security Code Does Not Match
+Payflow Pro and Express Checkout,Payflow Pro and Express Checkout
 "
                     <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
                                 <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
@@ -696,72 +697,72 @@ User,User
                                 Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                                 The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
                                 or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
-                "
+                "
 "PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                             You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
                             <a href=""https://www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>","PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                             You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                            <a href=""https://www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>"
-"Customize Smart Buttons","Customize Smart Buttons"
-"Checkout Page","Checkout Page"
-"Label","Label"
-"The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.","The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR."
-"Checkout","Checkout"
-"Pay","Pay"
-"Buy Now","Buy Now"
-"PayPal","PayPal"
-"Installment","Installment"
-"Mexico Installment Period","Mexico Installment Period"
-"Brazil Installment Period","Brazil Installment Period"
-"Layout","Layout"
-"Vertical","Vertical"
-"Horizontal","Horizontal"
-"Size","Size"
-"Responsive","Responsive"
-"Shape","Shape"
-"Pill","Pill"
-"Rectangle","Rectangle"
-"Color","Color"
-"Gold","Gold"
-"Blue","Blue"
-"Silver","Silver"
-"Black","Black"
-"Product Pages","Product Pages"
-"Cart Page","Cart Page"
-"Mini Cart","Mini Cart"
-"Features","Features"
-"PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD.","PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD."
-"PayPal Credit","PayPal Credit"
-"PayPal Guest Checkout Credit Card Icons","PayPal Guest Checkout Credit Card Icons"
-"Elektronisches Lastschriftverfahren - German ELV","Elektronisches Lastschriftverfahren - German ELV"
-"Please enter at least 0 and at most 65535","Please enter at least 0 and at most 65535"
-"Order is suspended as an account verification transaction is suspected to be fraudulent.","Order is suspended as an account verification transaction is suspected to be fraudulent."
-"Payment can't be accepted since transaction was rejected by merchant.","Payment can't be accepted since transaction was rejected by merchant."
-"A successful payment transaction has already been completed. Please, check if the order has been placed.","A successful payment transaction has already been completed. Please, check if the order has been placed."
-"Advertise PayPal PayLater","Advertise PayPal PayLater"
-"Enable PayPal PayLater","Enable PayPal PayLater"
-"Style Layout","Style Layout"
-"Logo Type","Logo Type"
-"Logo Position","Logo Position"
-"Text Color","Text Color"
-"Text Size","Text Size"
-"Ratio","Ratio"
-"White","White"
-"White No Border","White No Border"
-"Gray","Gray"
-"Left","Left"
-"Right","Right"
-"Top","Top"
-"Primary","Primary"
-"Alternative","Alternative"
-"Inline","Inline"
-"None","None"
-"Text","Text"
-"Flex","Flex"
-"Display pay later messaging on your site for offers like Pay in 3, which lets customers pay with 3 interest- free monthly payments. We’ll show messages on your site to promote this feature for you. You may not promote pay later offers with any other content, marketing, or materials","Display pay later messaging on your site for offers like Pay in 3, which lets customers pay with 3 interest- free monthly payments. We’ll show messages on your site to promote this feature for you. You may not promote pay later offers with any other content, marketing, or materials"
-"Enable PayPal PayLater Experience","Enable PayPal PayLater Experience"
-"Recommended. <strong>Advertise PayPal Credit</strong> is deprecated. See PayPal PayLater details and list of supported regions <a href="https://developer.paypal.com/docs/business/pay-later/us/#eligibility" target="_blank">here</a>.","Recommended. <strong>Advertise PayPal Credit</strong> is deprecated. See PayPal PayLater details and list of supported regions <a href="https://developer.paypal.com/docs/business/pay-later/us/#eligibility" target="_blank">here</a>.Recommended. <strong>Advertise PayPal Credit</strong> is deprecated. See PayPal PayLater details and list of supported regions <a href="https://developer.paypal.com/docs/business/pay-later/us/#eligibility" target="_blank">here</a>."
-"Monochrome","Monochrome"
-"Grayscale","Grayscale"
-"Sidebar","Sidebar"
-"Checkout Payment Step","Checkout Payment Step"
+                            <a href=""https://www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>"
+Customize Smart Buttons,Customize Smart Buttons
+Checkout Page,Checkout Page
+Label,Label
+"The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.","The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR."
+Checkout,Checkout
+Pay,Pay
+Buy Now,Buy Now
+PayPal,PayPal
+Installment,Installment
+Mexico Installment Period,Mexico Installment Period
+Brazil Installment Period,Brazil Installment Period
+Layout,Layout
+Vertical,Vertical
+Horizontal,Horizontal
+Size,Size
+Responsive,Responsive
+Shape,Shape
+Pill,Pill
+Rectangle,Rectangle
+Color,Color
+Gold,Gold
+Blue,Blue
+Silver,Silver
+Black,Black
+Product Pages,Product Pages
+Cart Page,Cart Page
+Mini Cart,Mini Cart
+Features,Features
+"PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD.","PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD."
+PayPal Credit,PayPal Credit
+PayPal Guest Checkout Credit Card Icons,PayPal Guest Checkout Credit Card Icons
+Elektronisches Lastschriftverfahren - German ELV,Elektronisches Lastschriftverfahren - German ELV
+Please enter at least 0 and at most 65535,Please enter at least 0 and at most 65535
+Order is suspended as an account verification transaction is suspected to be fraudulent.,Order is suspended as an account verification transaction is suspected to be fraudulent.
+Payment can't be accepted since transaction was rejected by merchant.,Payment can't be accepted since transaction was rejected by merchant.
+"A successful payment transaction has already been completed. Please, check if the order has been placed.","A successful payment transaction has already been completed. Please, check if the order has been placed."
+Advertise PayPal PayLater,Advertise PayPal PayLater
+Enable PayPal PayLater,Enable PayPal PayLater
+Style Layout,Style Layout
+Logo Type,Logo Type
+Logo Position,Logo Position
+Text Color,Text Color
+Text Size,Text Size
+Ratio,Ratio
+White,White
+White No Border,White No Border
+Gray,Gray
+Left,Left
+Right,Right
+Top,Top
+Primary,Primary
+Alternative,Alternative
+Inline,Inline
+None,None
+Text,Text
+Flex,Flex
+"Display pay later messaging on your site for offers like Pay in 3, which lets customers pay with 3 interest- free monthly payments. We’ll show messages on your site to promote this feature for you. You may not promote pay later offers with any other content, marketing, or materials","Display pay later messaging on your site for offers like Pay in 3, which lets customers pay with 3 interest- free monthly payments. We’ll show messages on your site to promote this feature for you. You may not promote pay later offers with any other content, marketing, or materials"
+Enable PayPal PayLater Experience,Enable PayPal PayLater Experience
+"Recommended. <strong>Advertise PayPal Credit</strong> is deprecated. See PayPal PayLater details and list of supported regions <a href=https://developer.paypal.com/docs/business/pay-later/us/#eligibility"" target=""_blank"">here</a>.""","Recommended. <strong>Advertise PayPal Credit</strong> is deprecated. See PayPal PayLater details and list of supported regions <a href=https://developer.paypal.com/docs/business/pay-later/us/#eligibility"" target=""_blank"">here</a>.Recommended. <strong>Advertise PayPal Credit</strong> is deprecated. See PayPal PayLater details and list of supported regions <a href=""https://developer.paypal.com/docs/business/pay-later/us/#eligibility"" target=""_blank"">here</a>."""
+Monochrome,Monochrome
+Grayscale,Grayscale
+Sidebar,Sidebar
+Checkout Payment Step,Checkout Payment Step
\ No newline at end of file

From dcd09bd3e5120f5a52d5d2956d297083e98b47a4 Mon Sep 17 00:00:00 2001
From: glo5363 <glo05363@adobe.com>
Date: Tue, 2 Nov 2021 14:13:29 +0530
Subject: [PATCH 54/87] Code review changes csv

---
 app/code/Magento/Paypal/i18n/en_US.csv | 1300 ++++++++++++------------
 1 file changed, 650 insertions(+), 650 deletions(-)

diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
index 4357c8d828a71..ea033ad2384ff 100644
--- a/app/code/Magento/Paypal/i18n/en_US.csv
+++ b/app/code/Magento/Paypal/i18n/en_US.csv
@@ -12,486 +12,486 @@
                                 Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                                 The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
                                 or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
-                "
-payflowpro,Payflow Pro
-Billing Agreements,Billing Agreements
-ID,ID
-Email,Email
-First Name,First Name
-Last Name,Last Name
-Reference ID,Reference ID
-Status,Status
-Created,Created
-N/A,N/A
-Updated,Updated
-Back,Back
-Are you sure you want to do this?,Are you sure you want to do this?
-Cancel,Cancel
-Billing Agreement #%1,Billing Agreement #%1
-General Information,General Information
-Related Orders,Related Orders
-Order,Order
-Purchased,Purchased
-Bill-to Name,Bill-to Name
-Ship-to Name,Ship-to Name
-Order Total,Order Total
-Purchase Point,Purchase Point
-Billing Agreement View,Billing Agreement View
-View Transaction Details,View Transaction Details
-Reference Information,Reference Information
-Transaction Information,Transaction Information
-PayPal Fee Information,PayPal Fee Information
-PayPal Settlement Reports,PayPal Settlement Reports
-We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?,We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?
-Fetch Updates,Fetch Updates
-button_label,button_label
-sandbox_button_label,sandbox_button_label
-Help,Help
-Configure,Configure
-Close,Close
-Learn More,Learn More
-View Demo,View Demo
-See terms,See terms
-You will be redirected to the PayPal website.,You will be redirected to the PayPal website.
-You will be redirected to the PayPal website when you place an order.,You will be redirected to the PayPal website when you place an order.
-Incl. Tax,Incl. Tax
-Billing Information,Billing Information
-Shipping Information,Shipping Information
-Invalid block type,Invalid block type
-Please specify the correct billing agreement ID and try again.,Please specify the correct billing agreement ID and try again.
-You canceled the billing agreement.,You canceled the billing agreement.
-We can't cancel the billing agreement.,We can't cancel the billing agreement.
-You deleted the billing agreement.,You deleted the billing agreement.
-We can't delete the billing agreement.,We can't delete the billing agreement.
-Reports,Reports
-Sales,Sales
-View Transaction,View Transaction
-We found nothing to fetch because of an empty configuration.,We found nothing to fetch because of an empty configuration.
-"We fetched %1 report rows from ""%2@%3.""","We fetched %1 report rows from ""%2@%3."""
-"We can't fetch reports from ""%1@%2.""","We can't fetch reports from ""%1@%2."""
-"The billing agreement ""%1"" has been canceled.","The billing agreement ""%1"" has been canceled."
-"The billing agreement ""%1"" has been created.","The billing agreement ""%1"" has been created."
-We couldn't finish the billing agreement wizard.,We couldn't finish the billing agreement wizard.
-We can't start the billing agreement wizard.,We can't start the billing agreement wizard.
-Billing Agreement # %1,Billing Agreement # %1
-We can't initialize Express Checkout.,We can't initialize Express Checkout.
-PayPal Express Checkout Token does not exist.,PayPal Express Checkout Token does not exist.
-A wrong PayPal Express Checkout Token is specified.,A wrong PayPal Express Checkout Token is specified.
-Express Checkout and Order have been canceled.,Express Checkout and Order have been canceled.
-Express Checkout has been canceled.,Express Checkout has been canceled.
-Unable to cancel Express Checkout,Unable to cancel Express Checkout
-Please agree to all the terms and conditions before placing the order.,Please agree to all the terms and conditions before placing the order.
-We can't place the order.,We can't place the order.
-We can't process Express Checkout approval.,We can't process Express Checkout approval.
-We can't initialize Express Checkout review.,We can't initialize Express Checkout review.
-We can't update shipping method.,We can't update shipping method.
-We can't start Express Checkout.,We can't start Express Checkout.
-"To check out, please sign in with your email address.","To check out, please sign in with your email address."
-"Sorry, but something went wrong","Sorry, but something went wrong"
-Your payment has been declined. Please try again.,Your payment has been declined. Please try again.
-Requested payment method does not match with order.,Requested payment method does not match with order.
-Would you like to sign a billing agreement to streamline further purchases with PayPal?,Would you like to sign a billing agreement to streamline further purchases with PayPal?
-"Error processing payment, please try again later.","Error processing payment, please try again later."
-Payment Gateway is unreachable at the moment. Please use another payment option.,Payment Gateway is unreachable at the moment. Please use another payment option.
-PayPal response hasn't required fields.,PayPal response hasn't required fields.
-Something went wrong while processing your order.,Something went wrong while processing your order.
-PayPal gateway has rejected request. %1,PayPal gateway has rejected request. %1
-The PayPal gateway rejected the request. %1,The PayPal gateway rejected the request. %1
-I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.,I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.
-I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.,I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.
-"A match of the Shipping Address City, State, and Postal Code failed.","A match of the Shipping Address City, State, and Postal Code failed."
-The payment method code is not set.,The payment method code is not set.
-The reference ID is not set.,The reference ID is not set.
-Unable to save Billing Agreement:,Unable to save Billing Agreement:
-Active,Active
-Canceled,Canceled
-The customer ID is not set.,The customer ID is not set.
-The Billing Agreement status is not set.,The Billing Agreement status is not set.
-The PayPal certificate does not exist.,The PayPal certificate does not exist.
-We prefer PayPal (150 X 60),We prefer PayPal (150 X 60)
-We prefer PayPal (150 X 40),We prefer PayPal (150 X 40)
-Now accepting PayPal (150 X 60),Now accepting PayPal (150 X 60)
-Now accepting PayPal (150 X 40),Now accepting PayPal (150 X 40)
-Payments by PayPal (150 X 60),Payments by PayPal (150 X 60)
-Payments by PayPal (150 X 40),Payments by PayPal (150 X 40)
-Shop now using (150 X 60),Shop now using (150 X 60)
-Shop now using (150 X 40),Shop now using (150 X 40)
-Dynamic,Dynamic
-Static,Static
-Shortcut,Shortcut
-Acceptance Mark Image,Acceptance Mark Image
-Authorization,Authorization
-Sale,Sale
-Yes,Yes
-No,No
-For Virtual Quotes Only,For Virtual Quotes Only
-Auto,Auto
-Ask Customer,Ask Customer
-Never,Never
-IPN (Instant Payment Notification) Only,IPN (Instant Payment Notification) Only
-API Signature,API Signature
-API Certificate,API Certificate
-The ordering amount of %1 is pending approval on the payment gateway.,The ordering amount of %1 is pending approval on the payment gateway.
-Ordered amount of %1,Ordered amount of %1
-We'll authorize the amount of %1 as soon as the payment gateway approves it.,We'll authorize the amount of %1 as soon as the payment gateway approves it.
-The authorized amount is %1.,The authorized amount is %1.
-The maximum number of child authorizations is reached.,The maximum number of child authorizations is reached.
-"PayPal can't process orders with a zero balance due. To finish your purchase, please go through the standard checkout process.","PayPal can't process orders with a zero balance due. To finish your purchase, please go through the standard checkout process."
-A payer is not identified.,A payer is not identified.
-Cannot get secure form URL from PayPal,Cannot get secure form URL from PayPal
-Last Transaction ID,Last Transaction ID
-This customer didn't include a confirmed address.,This customer didn't include a confirmed address.
-The payment is authorized but not settled.,The payment is authorized but not settled.
-The payment eCheck is not cleared.,The payment eCheck is not cleared.
-The merchant holds a non-U.S. account and doesn't have a withdrawal mechanism.,The merchant holds a non-U.S. account and doesn't have a withdrawal mechanism.
-The payment currency doesn't match any of the merchant's balances currency.,The payment currency doesn't match any of the merchant's balances currency.
-The payment is pending while it is being reviewed by PayPal for risk.,The payment is pending while it is being reviewed by PayPal for risk.
-The payment is pending because it was made to an email address that is not yet registered or confirmed.,The payment is pending because it was made to an email address that is not yet registered or confirmed.
-The merchant account is not yet verified.,The merchant account is not yet verified.
-The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.,The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.
-"Sorry, but something went wrong. Please contact PayPal customer service.","Sorry, but something went wrong. Please contact PayPal customer service."
-A reversal has occurred on this transaction due to a chargeback by your customer.,A reversal has occurred on this transaction due to a chargeback by your customer.
-A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.,A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.
-A reversal has occurred on this transaction due to a complaint about the transaction from your customer.,A reversal has occurred on this transaction due to a complaint about the transaction from your customer.
-A reversal has occurred on this transaction because you have given the customer a refund.,A reversal has occurred on this transaction because you have given the customer a refund.
-Reversal of an adjustment.,Reversal of an adjustment.
-Transaction reversal due to fraud detected by PayPal administrators.,Transaction reversal due to fraud detected by PayPal administrators.
-Transaction reversal by PayPal administrators.,Transaction reversal by PayPal administrators.
-Reimbursement for a chargeback.,Reimbursement for a chargeback.
-Settlement of a chargeback.,Settlement of a chargeback.
-A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.,A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.
-Buyer claims that he did not receive goods or service.,Buyer claims that he did not receive goods or service.
-Buyer claims that the goods or service received differ from merchant’s description of the goods or service.,Buyer claims that the goods or service received differ from merchant’s description of the goods or service.
-Buyer claims that he/she did not authorize transaction.,Buyer claims that he/she did not authorize transaction.
-A case that has been resolved and close requires a reimbursement.,A case that has been resolved and close requires a reimbursement.
-Buyer claims that a possible duplicate payment was made to the merchant.,Buyer claims that a possible duplicate payment was made to the merchant.
-"Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.","Buyer claims that the received merchandise is unsatisfactory, defective, or damaged."
-Unknown reason. Please contact PayPal customer service.,Unknown reason. Please contact PayPal customer service.
-Payer ID,Payer ID
-Payer Email,Payer Email
-Payer Status,Payer Status
-Payer Address ID,Payer Address ID
-Payer Address Status,Payer Address Status
-Merchant Protection Eligibility,Merchant Protection Eligibility
-Triggered Fraud Filters,Triggered Fraud Filters
-Last Correlation ID,Last Correlation ID
-Address Verification System Response,Address Verification System Response
-CVV2 Check Result by PayPal,CVV2 Check Result by PayPal
-AVS Street Match,AVS Street Match
-AVS zip,AVS zip
-International AVS response,International AVS response
-Buyer's Tax ID,Buyer's Tax ID
-Buyer's Tax ID Type,Buyer's Tax ID Type
-Chargeback,Chargeback
-Complaint,Complaint
-Dispute,Dispute
-Matched Address only (no ZIP),Matched Address only (no ZIP)
-Matched Address only (no ZIP) International,Matched Address only (no ZIP) International
-No Details matched,No Details matched
-No Details matched. International,No Details matched. International
-Exact Match.,Exact Match.
-Exact Match. Address and Postal Code. International,Exact Match. Address and Postal Code. International
-Exact Match. Address and Postal Code. UK-specific,Exact Match. Address and Postal Code. UK-specific
-N/A. Not allowed for MOTO (Internet/Phone) transactions,N/A. Not allowed for MOTO (Internet/Phone) transactions
-N/A. Global Unavailable,N/A. Global Unavailable
-N/A. International Unavailable,N/A. International Unavailable
-Matched five-digit ZIP only (no Address),Matched five-digit ZIP only (no Address)
-Matched Postal Code only (no Address),Matched Postal Code only (no Address)
-N/A. Retry,N/A. Retry
-N/A. Service not Supported,N/A. Service not Supported
-N/A. Unavailable,N/A. Unavailable
-Matched whole nine-digit ZIP (no Address),Matched whole nine-digit ZIP (no Address)
-Yes. Matched Address and five-digit ZIP,Yes. Matched Address and five-digit ZIP
-All the address information matched,All the address information matched
-None of the address information matched,None of the address information matched
-Part of the address information matched,Part of the address information matched
-N/A. The merchant did not provide AVS information,N/A. The merchant did not provide AVS information
-"N/A. Address not checked, or acquirer had no response. Service not available","N/A. Address not checked, or acquirer had no response. Service not available"
-Matched (CVV2CSC),Matched (CVV2CSC)
-No match,No match
-N/A. Not processed,N/A. Not processed
-N/A. Service not supported,N/A. Service not supported
-N/A. Service not available,N/A. Service not available
-N/A. No response,N/A. No response
-Matched (CVV2),Matched (CVV2)
-N/A. The merchant has not implemented CVV2 code handling,N/A. The merchant has not implemented CVV2 code handling
-N/A. Merchant has indicated that CVV2 is not present on card,N/A. Merchant has indicated that CVV2 is not present on card
-CNPJ,CNPJ
-CPF,CPF
-Note: %1,Note: %1
-"IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4","IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4"
-"IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3.","IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3."
-You notified customer about invoice #%1.,You notified customer about invoice #%1.
-We cannot cancel this order.,We cannot cancel this order.
-"IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4""","IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4"""
-You notified customer about creditmemo #%1.,You notified customer about creditmemo #%1.
-"IPN ""%1""","IPN ""%1"""
-Payflow PNREF: #%1.,Payflow PNREF: #%1.
-Unable to fetch transaction details.,Unable to fetch transaction details.
-Invalid method %1::%2,Invalid method %1::%2
-Transaction has been declined,Transaction has been declined
-Error processing payment. Please try again later.,Error processing payment. Please try again later.
-We cannot send the new order email.,We cannot send the new order email.
-Payment error. %value was not found.,Payment error. %value was not found.
-You cannot void a verification transaction.,You cannot void a verification transaction.
-You need an authorization transaction to void.,You need an authorization transaction to void.
-We can't issue a refund transaction because there is no capture transaction.,We can't issue a refund transaction because there is no capture transaction.
-We cannot create a target file for reading reports.,We cannot create a target file for reading reports.
-Report Date,Report Date
-Merchant Account,Merchant Account
-Transaction ID,Transaction ID
-Invoice ID,Invoice ID
-PayPal Reference ID,PayPal Reference ID
-PayPal Reference ID Type,PayPal Reference ID Type
-Event Code,Event Code
-Event,Event
-Start Date,Start Date
-Finish Date,Finish Date
-Debit or Credit,Debit or Credit
-Gross Amount,Gross Amount
-Fee Debit or Credit,Fee Debit or Credit
-Fee Amount,Fee Amount
-Custom,Custom
-Order ID,Order ID
-Preapproved Payment ID,Preapproved Payment ID
-Subscription ID,Subscription ID
-Credit,Credit
-Debit,Debit
-ACH Deposit (Hold for Dispute or Other Investigation),ACH Deposit (Hold for Dispute or Other Investigation)
-ACH Deposit (Reversal),ACH Deposit (Reversal)
-ACH Funding for Funds Recovery from Account Balance,ACH Funding for Funds Recovery from Account Balance
-ACH Withdrawal,ACH Withdrawal
-"Account-to-Account Payment, initiated by PayPal","Account-to-Account Payment, initiated by PayPal"
-Auction Payment other than through eBay,Auction Payment other than through eBay
-AutoSweep,AutoSweep
-Available Balance,Available Balance
-Balance Manager Account Bonus,Balance Manager Account Bonus
-Bonus for first ACH Use,Bonus for first ACH Use
-Buyer Credit Payment,Buyer Credit Payment
-Charge-off,Charge-off
-Coupon Redemption,Coupon Redemption
-Currency Conversion required to cover negative balance,Currency Conversion required to cover negative balance
-Debit Card Cash Back,Debit Card Cash Back
-Debit Card Transaction,Debit Card Transaction
-Direct Payment API,Direct Payment API
-EFT Funding (German banking),EFT Funding (German banking)
-Express Checkout APIs,Express Checkout APIs
-Fee Reversal,Fee Reversal
-Fee: Foreign ACH Withdrawal,Fee: Foreign ACH Withdrawal
-Fee: Mass Pay Request,Fee: Mass Pay Request
-Fee: Web Site Payments Pro Account Monthly,Fee: Web Site Payments Pro Account Monthly
-Fee: WorldLink Check Withdrawal,Fee: WorldLink Check Withdrawal
-Funding,Funding
-General (Authorization),General (Authorization)
-General (Dividend),General (Dividend)
-General (Funds Transfer from PayPal Account to Another),General (Funds Transfer from PayPal Account to Another)
-General (Purchase with a credit card),General (Purchase with a credit card)
-General Adjustment without businessrelated event,General Adjustment without businessrelated event
-General Currency Conversion,General Currency Conversion
-General Funding of PayPal Account ,General Funding of PayPal Account 
-General Redemption,General Redemption
-General Withdrawal from PayPal Account,General Withdrawal from PayPal Account
-General. Product no longer supported,General. Product no longer supported
-General: Use of PayPal account for purchasing as well as receiving payments,General: Use of PayPal account for purchasing as well as receiving payments
-General: Withdrawal from PayPal Account,General: Withdrawal from PayPal Account
-General: Withdrawal to Non-Bank Entity,General: Withdrawal to Non-Bank Entity
-General: adjustment of a type not belonging to the other T12xx categories,General: adjustment of a type not belonging to the other T12xx categories
-General: bonus of a type not belonging to the other T08xx categories,General: bonus of a type not belonging to the other T08xx categories
-General: event not yet categorized,General: event not yet categorized
-General: non-payment fee of a type not belonging to the other T01xx categories,General: non-payment fee of a type not belonging to the other T01xx categories
-General: received payment of a type not belonging to the other T00xx categories,General: received payment of a type not belonging to the other T00xx categories
-General: reversal of a type not belonging to the other T11xx categories,General: reversal of a type not belonging to the other T11xx categories
-General: temporary hold of a type not belonging to the other T15xx categories,General: temporary hold of a type not belonging to the other T15xx categories
-Gift Certificate Payment: purchase of Gift Certificate,Gift Certificate Payment: purchase of Gift Certificate
-Gift Certificate Redemption,Gift Certificate Redemption
-Hidden Virtual PayPal Debit Card Transaction,Hidden Virtual PayPal Debit Card Transaction
-Hold for Dispute Investigation,Hold for Dispute Investigation
-Incentive,Incentive
-Mass Pay Payment,Mass Pay Payment
-Merchant Referral Bonus,Merchant Referral Bonus
-Mobile Payment (made via a mobile phone),Mobile Payment (made via a mobile phone)
-Negative Balance,Negative Balance
-Open Authorization,Open Authorization
-PayPal Balance Manager function of PayPal account,PayPal Balance Manager function of PayPal account
-PayPal Buyer Warranty Bonus,PayPal Buyer Warranty Bonus
-PayPal Debit Card Cash Advance,PayPal Debit Card Cash Advance
-PayPal Debit Card Withdrawal from ATM,PayPal Debit Card Withdrawal from ATM
-PayPal Protection Bonus,PayPal Protection Bonus
-Payment Refund initiated by merchant,Payment Refund initiated by merchant
-Points Incentive Redemption,Points Incentive Redemption
-Postage Payment to either USPS or UPS,Postage Payment to either USPS or UPS
-"Preapproved Payment (BillUser API, either sent or received","Preapproved Payment (BillUser API, either sent or received"
-Reauthorization,Reauthorization
-Reimbursement of Chargeback,Reimbursement of Chargeback
-Reversal,Reversal
-Reversal of General Account Hold,Reversal of General Account Hold
-Reversal of Points Usage,Reversal of Points Usage
-Reversal of hold for Dispute Investigation,Reversal of hold for Dispute Investigation
-Reward Voucher Redemption,Reward Voucher Redemption
-Settlement Consolidation,Settlement Consolidation
-"Subscription Payment, either payment sent or payment received","Subscription Payment, either payment sent or payment received"
-User-initiated Currency Conversion,User-initiated Currency Conversion
-Virtual PayPal Debit Card Transaction,Virtual PayPal Debit Card Transaction
-Virtual Terminal Payment,Virtual Terminal Payment
-Void,Void
-WorldLink Withdrawal,WorldLink Withdrawal
-eBay Auction Payment,eBay Auction Payment
-The PayPal certificate file is empty.,The PayPal certificate file is empty.
-Header (center),Header (center)
-Sidebar (right),Sidebar (right)
-Near PayPal Credit checkout button,Near PayPal Credit checkout button
---Please Select--,--Please Select--
-Daily,Daily
-Every 3 days,Every 3 days
-Every 7 days,Every 7 days
-Every 10 days,Every 10 days
-Every 14 days,Every 14 days
-Every 30 days,Every 30 days
-Every 40 days,Every 40 days
-No Logo,No Logo
-Yes (PayPal recommends this option),Yes (PayPal recommends this option)
-Created billing agreement #%1.,Created billing agreement #%1.
-We can't create a billing agreement for this order.,We can't create a billing agreement for this order.
-Pending PayPal,Pending PayPal
-PayPal Reversed,PayPal Reversed
-PayPal Canceled Reversal,PayPal Canceled Reversal
-Error,Error
-Billing Agreement,Billing Agreement
-Please Select,Please Select
-Customer,Customer
-Created At,Created At
-Updated At,Updated At
-ending,ending
-expires,expires
-Not sure what PayPal payment method to use? Click ,Not sure what PayPal payment method to use? Click 
-here,here
- to learn more., to learn more.
-Important: ,Important: 
-"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website."
-"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
-"To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.","To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website."
-"Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
-Credit Card Type,Credit Card Type
-Credit Card Number,Credit Card Number
-Expiration Date,Expiration Date
-Card Verification Number,Card Verification Number
-Billing Agreement # ,Billing Agreement # 
-Agreement Information,Agreement Information
-Reference ID:,Reference ID:
-Status:,Status:
-Created:,Created:
-Updated:,Updated:
-Payment Method:,Payment Method:
-Order #,Order #
-Date,Date
-Ship To,Ship To
-Order Status,Order Status
-View Order,View Order
-Back to Billing Agreements,Back to Billing Agreements
-Payment Method,Payment Method
-View,View
-There are no billing agreements yet.,There are no billing agreements yet.
-New Billing Agreement,New Billing Agreement
-You will be redirected to the payment system website.,You will be redirected to the payment system website.
--- Please Select --,-- Please Select --
-Create...,Create...
-Your credit card will be charged for,Your credit card will be charged for
-Your billing agreement # is: ,Your billing agreement # is: 
-Shipping Method,Shipping Method
-Please select a shipping method...,Please select a shipping method...
-Update Shipping Method,Update Shipping Method
-"Sorry, no quotes are available for this order right now.","Sorry, no quotes are available for this order right now."
-Shipping Address,Shipping Address
-Edit,Edit
-Buy now with PayPal,Buy now with PayPal
-Edit Payment Information,Edit Payment Information
-Items in Your Shopping Cart,Items in Your Shopping Cart
-Edit Shopping Cart,Edit Shopping Cart
-Place Order,Place Order
-Submitting order information...,Submitting order information...
-Item,Item
-Price,Price
-Qty,Qty
-Subtotal,Subtotal
-Please update order data to get shipping methods and rates,Please update order data to get shipping methods and rates
-or,or
-Checkout with PayPal,Checkout with PayPal
-Please do not refresh the page until you complete payment.,Please do not refresh the page until you complete payment.
-You will be required to enter your payment details after you place an order.,You will be required to enter your payment details after you place an order.
-Continue,Continue
-Additional Options,Additional Options
--- Please Select Billing Agreement--,-- Please Select Billing Agreement--
-Acceptance Mark,Acceptance Mark
-What is PayPal?,What is PayPal?
-Sign a billing agreement to streamline further purchases  with PayPal.,Sign a billing agreement to streamline further purchases  with PayPal.
-Sign a billing agreement to streamline further purchases with PayPal.,Sign a billing agreement to streamline further purchases with PayPal.
-Continue to PayPal,Continue to PayPal
-Save credit card information for future use.,Save credit card information for future use.
-"Sorry, something went wrong.","Sorry, something went wrong."
-"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
-PayPal Section,PayPal Section
-PayPal Settlement,PayPal Settlement
-Fetch,Fetch
-Actions,Actions
-Manage,Manage
-Place Order Using Billing Agreements,Place Order Using Billing Agreements
-Merchant Location,Merchant Location
-Merchant Country,Merchant Country
-"If not specified, Default Country from General Config will be used","If not specified, Default Country from General Config will be used"
-Recommended Solutions:,Recommended Solutions:
-Other PayPal Payment Solutions:,Other PayPal Payment Solutions:
-Other Payment Methods:,Other Payment Methods:
-PayPal Express Checkout,PayPal Express Checkout
-Add another payment method to your existing solution or as a stand-alone option.,Add another payment method to your existing solution or as a stand-alone option.
-PayPal All-in-One Payment Solutions&nbsp;<i>Accept and process credit cards and PayPal payments.</i>,PayPal All-in-One Payment Solutions&nbsp;<i>Accept and process credit cards and PayPal payments.</i>
-Choose a secure bundled payment solution for your business.,Choose a secure bundled payment solution for your business.
-Payments Pro,Payments Pro
-Payments Pro and Express Checkout,Payments Pro and Express Checkout
-Basic Settings - PayPal Payments Pro,Basic Settings - PayPal Payments Pro
-PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>,PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>
-PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>,PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>
-Accept payments with a completely customizable checkout page.,Accept payments with a completely customizable checkout page.
-Process payments using your own internet merchant account.,Process payments using your own internet merchant account.
-Website Payments Pro,Website Payments Pro
-Express Checkout,Express Checkout
-Add PayPal as an additional payment method to your checkout page.,Add PayPal as an additional payment method to your checkout page.
-Required PayPal Settings,Required PayPal Settings
-Email Associated with PayPal Merchant Account (Optional),Email Associated with PayPal Merchant Account (Optional)
+                "
+payflowpro,"Payflow Pro"
+"Billing Agreements","Billing Agreements"
+ID,ID
+Email,Email
+"First Name","First Name"
+"Last Name","Last Name"
+"Reference ID","Reference ID"
+Status,Status
+Created,Created
+N/A,N/A
+Updated,Updated
+Back,Back
+"Are you sure you want to do this?","Are you sure you want to do this?"
+Cancel,Cancel
+"Billing Agreement #%1","Billing Agreement #%1"
+"General Information","General Information"
+"Related Orders","Related Orders"
+Order,Order
+Purchased,Purchased
+"Bill-to Name","Bill-to Name"
+"Ship-to Name","Ship-to Name"
+"Order Total","Order Total"
+"Purchase Point","Purchase Point"
+"Billing Agreement View","Billing Agreement View"
+"View Transaction Details","View Transaction Details"
+"Reference Information","Reference Information"
+"Transaction Information","Transaction Information"
+"PayPal Fee Information","PayPal Fee Information"
+"PayPal Settlement Reports","PayPal Settlement Reports"
+"We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?","We are connecting to the PayPal SFTP server to retrieve new reports. Are you sure you want to continue?"
+"Fetch Updates","Fetch Updates"
+button_label,button_label
+sandbox_button_label,sandbox_button_label
+Help,Help
+Configure,Configure
+Close,Close
+"Learn More","Learn More"
+"View Demo","View Demo"
+"See terms","See terms"
+"You will be redirected to the PayPal website.","You will be redirected to the PayPal website."
+"You will be redirected to the PayPal website when you place an order.","You will be redirected to the PayPal website when you place an order."
+"Incl. Tax","Incl. Tax"
+"Billing Information","Billing Information"
+"Shipping Information","Shipping Information"
+"Invalid block type","Invalid block type"
+"Please specify the correct billing agreement ID and try again.","Please specify the correct billing agreement ID and try again."
+"You canceled the billing agreement.","You canceled the billing agreement."
+"We can't cancel the billing agreement.","We can't cancel the billing agreement."
+"You deleted the billing agreement.","You deleted the billing agreement."
+"We can't delete the billing agreement.","We can't delete the billing agreement."
+Reports,Reports
+Sales,Sales
+"View Transaction","View Transaction"
+"We found nothing to fetch because of an empty configuration.","We found nothing to fetch because of an empty configuration."
+"We fetched %1 report rows from ""%2@%3.""","We fetched %1 report rows from ""%2@%3."""
+"We can't fetch reports from ""%1@%2.""","We can't fetch reports from ""%1@%2."""
+"The billing agreement ""%1"" has been canceled.","The billing agreement ""%1"" has been canceled."
+"The billing agreement ""%1"" has been created.","The billing agreement ""%1"" has been created."
+"We couldn't finish the billing agreement wizard.","We couldn't finish the billing agreement wizard."
+"We can't start the billing agreement wizard.","We can't start the billing agreement wizard."
+"Billing Agreement # %1","Billing Agreement # %1"
+"We can't initialize Express Checkout.","We can't initialize Express Checkout."
+"PayPal Express Checkout Token does not exist.","PayPal Express Checkout Token does not exist."
+"A wrong PayPal Express Checkout Token is specified.","A wrong PayPal Express Checkout Token is specified."
+"Express Checkout and Order have been canceled.","Express Checkout and Order have been canceled."
+"Express Checkout has been canceled.","Express Checkout has been canceled."
+"Unable to cancel Express Checkout","Unable to cancel Express Checkout"
+"Please agree to all the terms and conditions before placing the order.","Please agree to all the terms and conditions before placing the order."
+"We can't place the order.","We can't place the order."
+"We can't process Express Checkout approval.","We can't process Express Checkout approval."
+"We can't initialize Express Checkout review.","We can't initialize Express Checkout review."
+"We can't update shipping method.","We can't update shipping method."
+"We can't start Express Checkout.","We can't start Express Checkout."
+"To check out, please sign in with your email address.","To check out, please sign in with your email address."
+"Sorry, but something went wrong","Sorry, but something went wrong"
+"Your payment has been declined. Please try again.","Your payment has been declined. Please try again."
+"Requested payment method does not match with order.","Requested payment method does not match with order."
+"Would you like to sign a billing agreement to streamline further purchases with PayPal?","Would you like to sign a billing agreement to streamline further purchases with PayPal?"
+"Error processing payment, please try again later.","Error processing payment, please try again later."
+"Payment Gateway is unreachable at the moment. Please use another payment option.","Payment Gateway is unreachable at the moment. Please use another payment option."
+"PayPal response hasn't required fields.","PayPal response hasn't required fields."
+"Something went wrong while processing your order.","Something went wrong while processing your order."
+"PayPal gateway has rejected request. %1","PayPal gateway has rejected request. %1"
+"The PayPal gateway rejected the request. %1","The PayPal gateway rejected the request. %1"
+"I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.","I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you."
+"I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.","I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you."
+"A match of the Shipping Address City, State, and Postal Code failed.","A match of the Shipping Address City, State, and Postal Code failed."
+"The payment method code is not set.","The payment method code is not set."
+"The reference ID is not set.","The reference ID is not set."
+"Unable to save Billing Agreement:","Unable to save Billing Agreement:"
+Active,Active
+Canceled,Canceled
+"The customer ID is not set.","The customer ID is not set."
+"The Billing Agreement status is not set.","The Billing Agreement status is not set."
+"The PayPal certificate does not exist.","The PayPal certificate does not exist."
+"We prefer PayPal (150 X 60)","We prefer PayPal (150 X 60)"
+"We prefer PayPal (150 X 40)","We prefer PayPal (150 X 40)"
+"Now accepting PayPal (150 X 60)","Now accepting PayPal (150 X 60)"
+"Now accepting PayPal (150 X 40)","Now accepting PayPal (150 X 40)"
+"Payments by PayPal (150 X 60)","Payments by PayPal (150 X 60)"
+"Payments by PayPal (150 X 40)","Payments by PayPal (150 X 40)"
+"Shop now using (150 X 60)","Shop now using (150 X 60)"
+"Shop now using (150 X 40)","Shop now using (150 X 40)"
+Dynamic,Dynamic
+Static,Static
+Shortcut,Shortcut
+"Acceptance Mark Image","Acceptance Mark Image"
+Authorization,Authorization
+Sale,Sale
+Yes,Yes
+No,No
+"For Virtual Quotes Only","For Virtual Quotes Only"
+Auto,Auto
+"Ask Customer","Ask Customer"
+Never,Never
+"IPN (Instant Payment Notification) Only","IPN (Instant Payment Notification) Only"
+"API Signature","API Signature"
+"API Certificate","API Certificate"
+"The ordering amount of %1 is pending approval on the payment gateway.","The ordering amount of %1 is pending approval on the payment gateway."
+"Ordered amount of %1","Ordered amount of %1"
+"We'll authorize the amount of %1 as soon as the payment gateway approves it.","We'll authorize the amount of %1 as soon as the payment gateway approves it."
+"The authorized amount is %1.","The authorized amount is %1."
+"The maximum number of child authorizations is reached.","The maximum number of child authorizations is reached."
+"PayPal can't process orders with a zero balance due. To finish your purchase, please go through the standard checkout process.","PayPal can't process orders with a zero balance due. To finish your purchase, please go through the standard checkout process."
+"A payer is not identified.","A payer is not identified."
+"Cannot get secure form URL from PayPal","Cannot get secure form URL from PayPal"
+"Last Transaction ID","Last Transaction ID"
+"This customer didn't include a confirmed address.","This customer didn't include a confirmed address."
+"The payment is authorized but not settled.","The payment is authorized but not settled."
+"The payment eCheck is not cleared.","The payment eCheck is not cleared."
+"The merchant holds a non-U.S. account and doesn't have a withdrawal mechanism.","The merchant holds a non-U.S. account and doesn't have a withdrawal mechanism."
+"The payment currency doesn't match any of the merchant's balances currency.","The payment currency doesn't match any of the merchant's balances currency."
+"The payment is pending while it is being reviewed by PayPal for risk.","The payment is pending while it is being reviewed by PayPal for risk."
+"The payment is pending because it was made to an email address that is not yet registered or confirmed.","The payment is pending because it was made to an email address that is not yet registered or confirmed."
+"The merchant account is not yet verified.","The merchant account is not yet verified."
+"The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.","The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status."
+"Sorry, but something went wrong. Please contact PayPal customer service.","Sorry, but something went wrong. Please contact PayPal customer service."
+"A reversal has occurred on this transaction due to a chargeback by your customer.","A reversal has occurred on this transaction due to a chargeback by your customer."
+"A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.","A reversal has occurred on this transaction due to your customer triggering a money-back guarantee."
+"A reversal has occurred on this transaction due to a complaint about the transaction from your customer.","A reversal has occurred on this transaction due to a complaint about the transaction from your customer."
+"A reversal has occurred on this transaction because you have given the customer a refund.","A reversal has occurred on this transaction because you have given the customer a refund."
+"Reversal of an adjustment.","Reversal of an adjustment."
+"Transaction reversal due to fraud detected by PayPal administrators.","Transaction reversal due to fraud detected by PayPal administrators."
+"Transaction reversal by PayPal administrators.","Transaction reversal by PayPal administrators."
+"Reimbursement for a chargeback.","Reimbursement for a chargeback."
+"Settlement of a chargeback.","Settlement of a chargeback."
+"A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.","A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof."
+"Buyer claims that he did not receive goods or service.","Buyer claims that he did not receive goods or service."
+"Buyer claims that the goods or service received differ from merchant’s description of the goods or service.","Buyer claims that the goods or service received differ from merchant’s description of the goods or service."
+"Buyer claims that he/she did not authorize transaction.","Buyer claims that he/she did not authorize transaction."
+"A case that has been resolved and close requires a reimbursement.","A case that has been resolved and close requires a reimbursement."
+"Buyer claims that a possible duplicate payment was made to the merchant.","Buyer claims that a possible duplicate payment was made to the merchant."
+"Buyer claims that the received merchandise is unsatisfactory, defective, or damaged.","Buyer claims that the received merchandise is unsatisfactory, defective, or damaged."
+"Unknown reason. Please contact PayPal customer service.","Unknown reason. Please contact PayPal customer service."
+"Payer ID","Payer ID"
+"Payer Email","Payer Email"
+"Payer Status","Payer Status"
+"Payer Address ID","Payer Address ID"
+"Payer Address Status","Payer Address Status"
+"Merchant Protection Eligibility","Merchant Protection Eligibility"
+"Triggered Fraud Filters","Triggered Fraud Filters"
+"Last Correlation ID","Last Correlation ID"
+"Address Verification System Response","Address Verification System Response"
+"CVV2 Check Result by PayPal","CVV2 Check Result by PayPal"
+"AVS Street Match","AVS Street Match"
+"AVS zip","AVS zip"
+"International AVS response","International AVS response"
+"Buyer's Tax ID","Buyer's Tax ID"
+"Buyer's Tax ID Type","Buyer's Tax ID Type"
+Chargeback,Chargeback
+Complaint,Complaint
+Dispute,Dispute
+"Matched Address only (no ZIP)","Matched Address only (no ZIP)"
+"Matched Address only (no ZIP) International","Matched Address only (no ZIP) International"
+"No Details matched","No Details matched"
+"No Details matched. International","No Details matched. International"
+"Exact Match.","Exact Match."
+"Exact Match. Address and Postal Code. International","Exact Match. Address and Postal Code. International"
+"Exact Match. Address and Postal Code. UK-specific","Exact Match. Address and Postal Code. UK-specific"
+"N/A. Not allowed for MOTO (Internet/Phone) transactions","N/A. Not allowed for MOTO (Internet/Phone) transactions"
+"N/A. Global Unavailable","N/A. Global Unavailable"
+"N/A. International Unavailable","N/A. International Unavailable"
+"Matched five-digit ZIP only (no Address)","Matched five-digit ZIP only (no Address)"
+"Matched Postal Code only (no Address)","Matched Postal Code only (no Address)"
+"N/A. Retry","N/A. Retry"
+"N/A. Service not Supported","N/A. Service not Supported"
+"N/A. Unavailable","N/A. Unavailable"
+"Matched whole nine-digit ZIP (no Address)","Matched whole nine-digit ZIP (no Address)"
+"Yes. Matched Address and five-digit ZIP","Yes. Matched Address and five-digit ZIP"
+"All the address information matched","All the address information matched"
+"None of the address information matched","None of the address information matched"
+"Part of the address information matched","Part of the address information matched"
+"N/A. The merchant did not provide AVS information","N/A. The merchant did not provide AVS information"
+"N/A. Address not checked, or acquirer had no response. Service not available","N/A. Address not checked, or acquirer had no response. Service not available"
+"Matched (CVV2CSC)","Matched (CVV2CSC)"
+"No match","No match"
+"N/A. Not processed","N/A. Not processed"
+"N/A. Service not supported","N/A. Service not supported"
+"N/A. Service not available","N/A. Service not available"
+"N/A. No response","N/A. No response"
+"Matched (CVV2)","Matched (CVV2)"
+"N/A. The merchant has not implemented CVV2 code handling","N/A. The merchant has not implemented CVV2 code handling"
+"N/A. Merchant has indicated that CVV2 is not present on card","N/A. Merchant has indicated that CVV2 is not present on card"
+CNPJ,CNPJ
+CPF,CPF
+"Note: %1","Note: %1"
+"IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4","IPN ""%1"". Case type ""%2"". Case ID ""%3"" %4"
+"IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3.","IPN ""%1"". A dispute has been resolved and closed. %2 Transaction amount %3."
+"You notified customer about invoice #%1.","You notified customer about invoice #%1."
+"We cannot cancel this order.","We cannot cancel this order."
+"IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4""","IPN ""%1"". %2 Transaction amount %3. Transaction ID: ""%4"""
+"You notified customer about creditmemo #%1.","You notified customer about creditmemo #%1."
+"IPN ""%1""","IPN ""%1"""
+"Payflow PNREF: #%1.","Payflow PNREF: #%1."
+"Unable to fetch transaction details.","Unable to fetch transaction details."
+"Invalid method %1::%2","Invalid method %1::%2"
+"Transaction has been declined","Transaction has been declined"
+"Error processing payment. Please try again later.","Error processing payment. Please try again later."
+"We cannot send the new order email.","We cannot send the new order email."
+"Payment error. %value was not found.","Payment error. %value was not found."
+"You cannot void a verification transaction.","You cannot void a verification transaction."
+"You need an authorization transaction to void.","You need an authorization transaction to void."
+"We can't issue a refund transaction because there is no capture transaction.","We can't issue a refund transaction because there is no capture transaction."
+"We cannot create a target file for reading reports.","We cannot create a target file for reading reports."
+"Report Date","Report Date"
+"Merchant Account","Merchant Account"
+"Transaction ID","Transaction ID"
+"Invoice ID","Invoice ID"
+"PayPal Reference ID","PayPal Reference ID"
+"PayPal Reference ID Type","PayPal Reference ID Type"
+"Event Code","Event Code"
+Event,Event
+"Start Date","Start Date"
+"Finish Date","Finish Date"
+"Debit or Credit","Debit or Credit"
+"Gross Amount","Gross Amount"
+"Fee Debit or Credit","Fee Debit or Credit"
+"Fee Amount","Fee Amount"
+Custom,Custom
+"Order ID","Order ID"
+"Preapproved Payment ID","Preapproved Payment ID"
+"Subscription ID","Subscription ID"
+Credit,Credit
+Debit,Debit
+"ACH Deposit (Hold for Dispute or Other Investigation)","ACH Deposit (Hold for Dispute or Other Investigation)"
+"ACH Deposit (Reversal)","ACH Deposit (Reversal)"
+"ACH Funding for Funds Recovery from Account Balance","ACH Funding for Funds Recovery from Account Balance"
+"ACH Withdrawal","ACH Withdrawal"
+"Account-to-Account Payment, initiated by PayPal","Account-to-Account Payment, initiated by PayPal"
+"Auction Payment other than through eBay","Auction Payment other than through eBay"
+AutoSweep,AutoSweep
+"Available Balance","Available Balance"
+"Balance Manager Account Bonus","Balance Manager Account Bonus"
+"Bonus for first ACH Use","Bonus for first ACH Use"
+"Buyer Credit Payment","Buyer Credit Payment"
+Charge-off,Charge-off
+"Coupon Redemption","Coupon Redemption"
+"Currency Conversion required to cover negative balance","Currency Conversion required to cover negative balance"
+"Debit Card Cash Back","Debit Card Cash Back"
+"Debit Card Transaction","Debit Card Transaction"
+"Direct Payment API","Direct Payment API"
+"EFT Funding (German banking)","EFT Funding (German banking)"
+"Express Checkout APIs","Express Checkout APIs"
+"Fee Reversal","Fee Reversal"
+"Fee: Foreign ACH Withdrawal","Fee: Foreign ACH Withdrawal"
+"Fee: Mass Pay Request","Fee: Mass Pay Request"
+"Fee: Web Site Payments Pro Account Monthly","Fee: Web Site Payments Pro Account Monthly"
+"Fee: WorldLink Check Withdrawal","Fee: WorldLink Check Withdrawal"
+Funding,Funding
+"General (Authorization)","General (Authorization)"
+"General (Dividend)","General (Dividend)"
+"General (Funds Transfer from PayPal Account to Another)","General (Funds Transfer from PayPal Account to Another)"
+"General (Purchase with a credit card)","General (Purchase with a credit card)"
+"General Adjustment without businessrelated event","General Adjustment without businessrelated event"
+"General Currency Conversion","General Currency Conversion"
+"General Funding of PayPal Account ","General Funding of PayPal Account "
+"General Redemption","General Redemption"
+"General Withdrawal from PayPal Account","General Withdrawal from PayPal Account"
+"General. Product no longer supported","General. Product no longer supported"
+"General: Use of PayPal account for purchasing as well as receiving payments","General: Use of PayPal account for purchasing as well as receiving payments"
+"General: Withdrawal from PayPal Account","General: Withdrawal from PayPal Account"
+"General: Withdrawal to Non-Bank Entity","General: Withdrawal to Non-Bank Entity"
+"General: adjustment of a type not belonging to the other T12xx categories","General: adjustment of a type not belonging to the other T12xx categories"
+"General: bonus of a type not belonging to the other T08xx categories","General: bonus of a type not belonging to the other T08xx categories"
+"General: event not yet categorized","General: event not yet categorized"
+"General: non-payment fee of a type not belonging to the other T01xx categories","General: non-payment fee of a type not belonging to the other T01xx categories"
+"General: received payment of a type not belonging to the other T00xx categories","General: received payment of a type not belonging to the other T00xx categories"
+"General: reversal of a type not belonging to the other T11xx categories","General: reversal of a type not belonging to the other T11xx categories"
+"General: temporary hold of a type not belonging to the other T15xx categories","General: temporary hold of a type not belonging to the other T15xx categories"
+"Gift Certificate Payment: purchase of Gift Certificate","Gift Certificate Payment: purchase of Gift Certificate"
+"Gift Certificate Redemption","Gift Certificate Redemption"
+"Hidden Virtual PayPal Debit Card Transaction","Hidden Virtual PayPal Debit Card Transaction"
+"Hold for Dispute Investigation","Hold for Dispute Investigation"
+Incentive,Incentive
+"Mass Pay Payment","Mass Pay Payment"
+"Merchant Referral Bonus","Merchant Referral Bonus"
+"Mobile Payment (made via a mobile phone)","Mobile Payment (made via a mobile phone)"
+"Negative Balance","Negative Balance"
+"Open Authorization","Open Authorization"
+"PayPal Balance Manager function of PayPal account","PayPal Balance Manager function of PayPal account"
+"PayPal Buyer Warranty Bonus","PayPal Buyer Warranty Bonus"
+"PayPal Debit Card Cash Advance","PayPal Debit Card Cash Advance"
+"PayPal Debit Card Withdrawal from ATM","PayPal Debit Card Withdrawal from ATM"
+"PayPal Protection Bonus","PayPal Protection Bonus"
+"Payment Refund initiated by merchant","Payment Refund initiated by merchant"
+"Points Incentive Redemption","Points Incentive Redemption"
+"Postage Payment to either USPS or UPS","Postage Payment to either USPS or UPS"
+"Preapproved Payment (BillUser API, either sent or received","Preapproved Payment (BillUser API, either sent or received"
+Reauthorization,Reauthorization
+"Reimbursement of Chargeback","Reimbursement of Chargeback"
+Reversal,Reversal
+"Reversal of General Account Hold","Reversal of General Account Hold"
+"Reversal of Points Usage","Reversal of Points Usage"
+"Reversal of hold for Dispute Investigation","Reversal of hold for Dispute Investigation"
+"Reward Voucher Redemption","Reward Voucher Redemption"
+"Settlement Consolidation","Settlement Consolidation"
+"Subscription Payment, either payment sent or payment received","Subscription Payment, either payment sent or payment received"
+"User-initiated Currency Conversion","User-initiated Currency Conversion"
+"Virtual PayPal Debit Card Transaction","Virtual PayPal Debit Card Transaction"
+"Virtual Terminal Payment","Virtual Terminal Payment"
+Void,Void
+"WorldLink Withdrawal","WorldLink Withdrawal"
+"eBay Auction Payment","eBay Auction Payment"
+"The PayPal certificate file is empty.","The PayPal certificate file is empty."
+"Header (center)","Header (center)"
+"Sidebar (right)","Sidebar (right)"
+"Near PayPal Credit checkout button","Near PayPal Credit checkout button"
+"--Please Select--","--Please Select--"
+Daily,Daily
+"Every 3 days","Every 3 days"
+"Every 7 days","Every 7 days"
+"Every 10 days","Every 10 days"
+"Every 14 days","Every 14 days"
+"Every 30 days","Every 30 days"
+"Every 40 days","Every 40 days"
+"No Logo","No Logo"
+"Yes (PayPal recommends this option)","Yes (PayPal recommends this option)"
+"Created billing agreement #%1.","Created billing agreement #%1."
+"We can't create a billing agreement for this order.","We can't create a billing agreement for this order."
+"Pending PayPal","Pending PayPal"
+"PayPal Reversed","PayPal Reversed"
+"PayPal Canceled Reversal","PayPal Canceled Reversal"
+Error,Error
+"Billing Agreement","Billing Agreement"
+"Please Select","Please Select"
+Customer,Customer
+"Created At","Created At"
+"Updated At","Updated At"
+ending,ending
+expires,expires
+"Not sure what PayPal payment method to use? Click ","Not sure what PayPal payment method to use? Click "
+here,here
+" to learn more."," to learn more."
+"Important: ","Important: "
+"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website."
+"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
+"To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.","To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website."
+"Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
+"Credit Card Type","Credit Card Type"
+"Credit Card Number","Credit Card Number"
+"Expiration Date","Expiration Date"
+"Card Verification Number","Card Verification Number"
+"Billing Agreement # ","Billing Agreement # "
+"Agreement Information","Agreement Information"
+"Reference ID:","Reference ID:"
+Status:,Status:
+Created:,Created:
+Updated:,Updated:
+"Payment Method:","Payment Method:"
+"Order #","Order #"
+Date,Date
+"Ship To","Ship To"
+"Order Status","Order Status"
+"View Order","View Order"
+"Back to Billing Agreements","Back to Billing Agreements"
+"Payment Method","Payment Method"
+View,View
+"There are no billing agreements yet.","There are no billing agreements yet."
+"New Billing Agreement","New Billing Agreement"
+"You will be redirected to the payment system website.","You will be redirected to the payment system website."
+"-- Please Select --","-- Please Select --"
+Create...,Create...
+"Your credit card will be charged for","Your credit card will be charged for"
+"Your billing agreement # is: ","Your billing agreement # is: "
+"Shipping Method","Shipping Method"
+"Please select a shipping method...","Please select a shipping method..."
+"Update Shipping Method","Update Shipping Method"
+"Sorry, no quotes are available for this order right now.","Sorry, no quotes are available for this order right now."
+"Shipping Address","Shipping Address"
+Edit,Edit
+"Buy now with PayPal","Buy now with PayPal"
+"Edit Payment Information","Edit Payment Information"
+"Items in Your Shopping Cart","Items in Your Shopping Cart"
+"Edit Shopping Cart","Edit Shopping Cart"
+"Place Order","Place Order"
+"Submitting order information...","Submitting order information..."
+Item,Item
+Price,Price
+Qty,Qty
+Subtotal,Subtotal
+"Please update order data to get shipping methods and rates","Please update order data to get shipping methods and rates"
+or,or
+"Checkout with PayPal","Checkout with PayPal"
+"Please do not refresh the page until you complete payment.","Please do not refresh the page until you complete payment."
+"You will be required to enter your payment details after you place an order.","You will be required to enter your payment details after you place an order."
+Continue,Continue
+"Additional Options","Additional Options"
+"-- Please Select Billing Agreement--","-- Please Select Billing Agreement--"
+"Acceptance Mark","Acceptance Mark"
+"What is PayPal?","What is PayPal?"
+"Sign a billing agreement to streamline further purchases  with PayPal.","Sign a billing agreement to streamline further purchases  with PayPal."
+"Sign a billing agreement to streamline further purchases with PayPal.","Sign a billing agreement to streamline further purchases with PayPal."
+"Continue to PayPal","Continue to PayPal"
+"Save credit card information for future use.","Save credit card information for future use."
+"Sorry, something went wrong.","Sorry, something went wrong."
+"Sorry, something went wrong. Please try again later.","Sorry, something went wrong. Please try again later."
+"PayPal Section","PayPal Section"
+"PayPal Settlement","PayPal Settlement"
+Fetch,Fetch
+Actions,Actions
+Manage,Manage
+"Place Order Using Billing Agreements","Place Order Using Billing Agreements"
+"Merchant Location","Merchant Location"
+"Merchant Country","Merchant Country"
+"If not specified, Default Country from General Config will be used","If not specified, Default Country from General Config will be used"
+"Recommended Solutions:","Recommended Solutions:"
+"Other PayPal Payment Solutions:","Other PayPal Payment Solutions:"
+"Other Payment Methods:","Other Payment Methods:"
+"PayPal Express Checkout","PayPal Express Checkout"
+"Add another payment method to your existing solution or as a stand-alone option.","Add another payment method to your existing solution or as a stand-alone option."
+"PayPal All-in-One Payment Solutions&nbsp;<i>Accept and process credit cards and PayPal payments.</i>","PayPal All-in-One Payment Solutions&nbsp;<i>Accept and process credit cards and PayPal payments.</i>"
+"Choose a secure bundled payment solution for your business.","Choose a secure bundled payment solution for your business."
+"Payments Pro","Payments Pro"
+"Payments Pro and Express Checkout","Payments Pro and Express Checkout"
+"Basic Settings - PayPal Payments Pro","Basic Settings - PayPal Payments Pro"
+"PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>","PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>"
+"PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>","PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>"
+"Accept payments with a completely customizable checkout page.","Accept payments with a completely customizable checkout page."
+"Process payments using your own internet merchant account.","Process payments using your own internet merchant account."
+"Website Payments Pro","Website Payments Pro"
+"Express Checkout","Express Checkout"
+"Add PayPal as an additional payment method to your checkout page.","Add PayPal as an additional payment method to your checkout page."
+"Required PayPal Settings","Required PayPal Settings"
+"Email Associated with PayPal Merchant Account (Optional)","Email Associated with PayPal Merchant Account (Optional)"
 "
                         <a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>
                     ","
                         <a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>
-                    "
-Don't have a PayPal account? Simply enter your email address.,Don't have a PayPal account? Simply enter your email address.
-API Authentication Methods,API Authentication Methods
-API Username,API Username
-API Password,API Password
-Get Credentials from PayPal,Get Credentials from PayPal
-Sandbox Mode,Sandbox Mode
-Buyer Country,Buyer Country
-API Uses Proxy,API Uses Proxy
-Proxy Host,Proxy Host
-Proxy Port,Proxy Port
-Enable this Solution,Enable this Solution
-Enable In-Context Checkout Experience,Enable In-Context Checkout Experience
+                    "
+"Don't have a PayPal account? Simply enter your email address.","Don't have a PayPal account? Simply enter your email address."
+"API Authentication Methods","API Authentication Methods"
+"API Username","API Username"
+"API Password","API Password"
+"Get Credentials from PayPal","Get Credentials from PayPal"
+"Sandbox Mode","Sandbox Mode"
+"Buyer Country","Buyer Country"
+"API Uses Proxy","API Uses Proxy"
+"Proxy Host","Proxy Host"
+"Proxy Port","Proxy Port"
+"Enable this Solution","Enable this Solution"
+"Enable In-Context Checkout Experience","Enable In-Context Checkout Experience"
 "
                     See PayPal Feature Support details and list of supported regions
                     <a href=""https://developer.paypal.com/docs/classic/express-checkout/in-context/"" target=""_blank"">here</a>.
                 ","
                     See PayPal Feature Support details and list of supported regions
                     <a href=""https://developer.paypal.com/docs/classic/express-checkout/in-context/"" target=""_blank"">here</a>.
-                "
-Merchant Account ID,Merchant Account ID
-Enable PayPal Credit,Enable PayPal Credit
+                "
+"Merchant Account ID","Merchant Account ID"
+"Enable PayPal Credit","Enable PayPal Credit"
 "PayPal Express Checkout lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
                         <a href=""https://www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
                 ","PayPal Express Checkout lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
                         <a href=""https://www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
-                "
-Sort Order PayPal Credit,Sort Order PayPal Credit
-Advertise PayPal Credit,Advertise PayPal Credit
+                "
+"Sort Order PayPal Credit","Sort Order PayPal Credit"
+"Advertise PayPal Credit","Advertise PayPal Credit"
 "
                     <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
                         <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
@@ -506,114 +506,114 @@ Advertise PayPal Credit,Advertise PayPal Credit
                         Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                         The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
                         or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
-                "
-Publisher ID,Publisher ID
-Required to display a banner,Required to display a banner
-Get Publisher ID from PayPal,Get Publisher ID from PayPal
-Home Page,Home Page
-Display,Display
-Position,Position
-Size,Size
-Catalog Category Page,Catalog Category Page
-Catalog Product Page,Catalog Product Page
-Checkout Cart Page,Checkout Cart Page
-Basic Settings - PayPal Express Checkout,Basic Settings - PayPal Express Checkout
-Title,Title
-"It is recommended to set this value to ""PayPal"" per store views.","It is recommended to set this value to ""PayPal"" per store views."
-Sort Order,Sort Order
-Payment Action,Payment Action
-Display on Product Details Page,Display on Product Details Page
-Authorization Honor Period (days),Authorization Honor Period (days)
-Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.,Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.
-Order Valid Period (days),Order Valid Period (days)
-Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.,Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.
-Number of Child Authorizations,Number of Child Authorizations
-The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.,The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.
-Advanced Settings,Advanced Settings
-Display on Shopping Cart,Display on Shopping Cart
-Also affects mini-shopping cart.,Also affects mini-shopping cart.
-Payment Applicable From,Payment Applicable From
-Countries Payment Applicable From,Countries Payment Applicable From
-Debug Mode,Debug Mode
-Enable SSL verification,Enable SSL verification
-Transfer Cart Line Items,Transfer Cart Line Items
-Transfer Shipping Options,Transfer Shipping Options
-"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only."
-Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.,Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.
-Shortcut Buttons Flavor,Shortcut Buttons Flavor
-Enable PayPal Guest Checkout,Enable PayPal Guest Checkout
-Ability for buyer to purchase without PayPal account.,Ability for buyer to purchase without PayPal account.
-Require Customer's Billing Address,Require Customer's Billing Address
-This feature needs be enabled first for the merchant account through PayPal technical support.,This feature needs be enabled first for the merchant account through PayPal technical support.
-Billing Agreement Signup,Billing Agreement Signup
-"Whether to create a billing agreement, if there are no active billing agreements available.","Whether to create a billing agreement, if there are no active billing agreements available."
+                "
+"Publisher ID","Publisher ID"
+"Required to display a banner","Required to display a banner"
+"Get Publisher ID from PayPal","Get Publisher ID from PayPal"
+"Home Page","Home Page"
+Display,Display
+Position,Position
+Size,Size
+"Catalog Category Page","Catalog Category Page"
+"Catalog Product Page","Catalog Product Page"
+"Checkout Cart Page","Checkout Cart Page"
+"Basic Settings - PayPal Express Checkout","Basic Settings - PayPal Express Checkout"
+Title,Title
+"It is recommended to set this value to ""PayPal"" per store views.","It is recommended to set this value to ""PayPal"" per store views."
+"Sort Order","Sort Order"
+"Payment Action","Payment Action"
+"Display on Product Details Page","Display on Product Details Page"
+"Authorization Honor Period (days)","Authorization Honor Period (days)"
+"Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Authorization Honor Period is on the merchant’s PayPal account. It must mirror the setting in PayPal."
+"Order Valid Period (days)","Order Valid Period (days)"
+"Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal.","Specifies what the Order Valid Period is on the merchant’s PayPal account. It must mirror the setting in PayPal."
+"Number of Child Authorizations","Number of Child Authorizations"
+"The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.","The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase."
+"Advanced Settings","Advanced Settings"
+"Display on Shopping Cart","Display on Shopping Cart"
+"Also affects mini-shopping cart.","Also affects mini-shopping cart."
+"Payment Applicable From","Payment Applicable From"
+"Countries Payment Applicable From","Countries Payment Applicable From"
+"Debug Mode","Debug Mode"
+"Enable SSL verification","Enable SSL verification"
+"Transfer Cart Line Items","Transfer Cart Line Items"
+"Transfer Shipping Options","Transfer Shipping Options"
+"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only."
+"Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.","Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available."
+"Shortcut Buttons Flavor","Shortcut Buttons Flavor"
+"Enable PayPal Guest Checkout","Enable PayPal Guest Checkout"
+"Ability for buyer to purchase without PayPal account.","Ability for buyer to purchase without PayPal account."
+"Require Customer's Billing Address","Require Customer's Billing Address"
+"This feature needs be enabled first for the merchant account through PayPal technical support.","This feature needs be enabled first for the merchant account through PayPal technical support."
+"Billing Agreement Signup","Billing Agreement Signup"
+"Whether to create a billing agreement, if there are no active billing agreements available.","Whether to create a billing agreement, if there are no active billing agreements available."
 "
                         Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.
                     ","
                         Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.
-                    "
-Skip Order Review Step,Skip Order Review Step
-PayPal Billing Agreement Settings,PayPal Billing Agreement Settings
-Enabled,Enabled
+                    "
+"Skip Order Review Step","Skip Order Review Step"
+"PayPal Billing Agreement Settings","PayPal Billing Agreement Settings"
+Enabled,Enabled
 "
                             Will appear as a payment option only for customers who have at least one active billing agreement.
                         ","
                             Will appear as a payment option only for customers who have at least one active billing agreement.
-                        "
-Allow in Billing Agreement Wizard,Allow in Billing Agreement Wizard
-Settlement Report Settings,Settlement Report Settings
-SFTP Credentials,SFTP Credentials
-Login,Login
-Password,Password
-Custom Endpoint Hostname or IP-Address,Custom Endpoint Hostname or IP-Address
-"By default it is ""reports.paypal.com"".","By default it is ""reports.paypal.com""."
-"Use colon to specify port. For example: ""test.example.com:5224"".","Use colon to specify port. For example: ""test.example.com:5224""."
-Custom Path,Custom Path
-Scheduled Fetching,Scheduled Fetching
-Enable Automatic Fetching,Enable Automatic Fetching
-Schedule,Schedule
-PayPal retains reports for 45 days.,PayPal retains reports for 45 days.
-Time of Day,Time of Day
-Frontend Experience Settings,Frontend Experience Settings
-PayPal Product Logo,PayPal Product Logo
-Displays on catalog pages and homepage.,Displays on catalog pages and homepage.
-PayPal Merchant Pages Style,PayPal Merchant Pages Style
-Page Style,Page Style
+                        "
+"Allow in Billing Agreement Wizard","Allow in Billing Agreement Wizard"
+"Settlement Report Settings","Settlement Report Settings"
+"SFTP Credentials","SFTP Credentials"
+Login,Login
+Password,Password
+"Custom Endpoint Hostname or IP-Address","Custom Endpoint Hostname or IP-Address"
+"By default it is ""reports.paypal.com"".","By default it is ""reports.paypal.com""."
+"Use colon to specify port. For example: ""test.example.com:5224"".","Use colon to specify port. For example: ""test.example.com:5224""."
+"Custom Path","Custom Path"
+"Scheduled Fetching","Scheduled Fetching"
+"Enable Automatic Fetching","Enable Automatic Fetching"
+Schedule,Schedule
+"PayPal retains reports for 45 days.","PayPal retains reports for 45 days."
+"Time of Day","Time of Day"
+"Frontend Experience Settings","Frontend Experience Settings"
+"PayPal Product Logo","PayPal Product Logo"
+"Displays on catalog pages and homepage.","Displays on catalog pages and homepage."
+"PayPal Merchant Pages Style","PayPal Merchant Pages Style"
+"Page Style","Page Style"
 "
                             Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).
                         ","
                             Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).
-                        "
-Header Image URL,Header Image URL
+                        "
+"Header Image URL","Header Image URL"
 "
                             The image at the top left of the checkout page. Max size is 750x90-pixel. <strong class=""colorRed"">https</strong> is highly encouraged.
                         ","
                             The image at the top left of the checkout page. Max size is 750x90-pixel. <strong class=""colorRed"">https</strong> is highly encouraged.
-                        "
-Header Background Color,Header Background Color
+                        "
+"Header Background Color","Header Background Color"
 "
                             The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.
                         ","
                             The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.
-                        "
-Header Border Color,Header Border Color
-2-pixel perimeter around the header space.,2-pixel perimeter around the header space.
-Page Background Color,Page Background Color
+                        "
+"Header Border Color","Header Border Color"
+"2-pixel perimeter around the header space.","2-pixel perimeter around the header space."
+"Page Background Color","Page Background Color"
 "
                             The background color for the checkout page around the header and payment form.
                         ","
                             The background color for the checkout page around the header and payment form.
-                        "
-Payments Advanced,Payments Advanced
-Accept payments with a PCI-compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>),Accept payments with a PCI-compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)
-Payments Advanced and Express Checkout,Payments Advanced and Express Checkout
-Partner,Partner
-Vendor,Vendor
-User,User
-PayPal recommends that you set up an additional User on your account at manager.paypal.com,PayPal recommends that you set up an additional User on your account at manager.paypal.com
-"PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.","PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here."
-Test Mode,Test Mode
-Use Proxy,Use Proxy
+                        "
+"Payments Advanced","Payments Advanced"
+"Accept payments with a PCI-compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)","Accept payments with a PCI-compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)"
+"Payments Advanced and Express Checkout","Payments Advanced and Express Checkout"
+Partner,Partner
+Vendor,Vendor
+User,User
+"PayPal recommends that you set up an additional User on your account at manager.paypal.com","PayPal recommends that you set up an additional User on your account at manager.paypal.com"
+"PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.","PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here."
+"Test Mode","Test Mode"
+"Use Proxy","Use Proxy"
 "
                     <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
                                             <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
@@ -628,23 +628,23 @@ Use Proxy,Use Proxy
                                             Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                                             The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
                                             or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
-                "
-Basic Settings - PayPal Payments Advanced,Basic Settings - PayPal Payments Advanced
-"It is recommended to set this value to ""Debit or Credit Card"" per store views.","It is recommended to set this value to ""Debit or Credit Card"" per store views."
-CVV Entry is Editable,CVV Entry is Editable
-Require CVV Entry,Require CVV Entry
-Send Email Confirmation,Send Email Confirmation
-URL method for Cancel URL and Return URL,URL method for Cancel URL and Return URL
-Payflow Link,Payflow Link
-Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>),Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)
-Payflow Link and Express Checkout,Payflow Link and Express Checkout
-"If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.","If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here."
-Enable Payflow Link,Enable Payflow Link
-Enable Express Checkout,Enable Express Checkout
-Basic Settings - PayPal Payflow Link,Basic Settings - PayPal Payflow Link
-Website Payments Pro Hosted Solution,Website Payments Pro Hosted Solution
-Accept payments with a PCI compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>),Accept payments with a PCI compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)
-Payments Pro Hosted Solution,Payments Pro Hosted Solution
+                "
+"Basic Settings - PayPal Payments Advanced","Basic Settings - PayPal Payments Advanced"
+"It is recommended to set this value to ""Debit or Credit Card"" per store views.","It is recommended to set this value to ""Debit or Credit Card"" per store views."
+"CVV Entry is Editable","CVV Entry is Editable"
+"Require CVV Entry","Require CVV Entry"
+"Send Email Confirmation","Send Email Confirmation"
+"URL method for Cancel URL and Return URL","URL method for Cancel URL and Return URL"
+"Payflow Link","Payflow Link"
+"Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)","Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)"
+"Payflow Link and Express Checkout","Payflow Link and Express Checkout"
+"If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.","If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here."
+"Enable Payflow Link","Enable Payflow Link"
+"Enable Express Checkout","Enable Express Checkout"
+"Basic Settings - PayPal Payflow Link","Basic Settings - PayPal Payflow Link"
+"Website Payments Pro Hosted Solution","Website Payments Pro Hosted Solution"
+"Accept payments with a PCI compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)","Accept payments with a PCI compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)"
+"Payments Pro Hosted Solution","Payments Pro Hosted Solution"
 "
                     <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
                             <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
@@ -659,30 +659,30 @@ Payments Pro Hosted Solution,Payments Pro Hosted Solution
                             Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                             The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
                             or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
-                "
-Basic Settings - PayPal Payments Pro Hosted Solution,Basic Settings - PayPal Payments Pro Hosted Solution
-Display Express Checkout in the Payment Information step,Display Express Checkout in the Payment Information step
-Website Payments Pro Hosted Solution and Express Checkout,Website Payments Pro Hosted Solution and Express Checkout
-Basic Settings - PayPal Website Payments Pro Hosted Solution,Basic Settings - PayPal Website Payments Pro Hosted Solution
-Payflow Pro,Payflow Pro
-Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>),Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)
-Vault Enabled,Vault Enabled
-Basic Settings - PayPal Payflow Pro,Basic Settings - PayPal Payflow Pro
-Vault Title,Vault Title
-Credit Card Settings,Credit Card Settings
-Allowed Credit Card Types,Allowed Credit Card Types
+                "
+"Basic Settings - PayPal Payments Pro Hosted Solution","Basic Settings - PayPal Payments Pro Hosted Solution"
+"Display Express Checkout in the Payment Information step","Display Express Checkout in the Payment Information step"
+"Website Payments Pro Hosted Solution and Express Checkout","Website Payments Pro Hosted Solution and Express Checkout"
+"Basic Settings - PayPal Website Payments Pro Hosted Solution","Basic Settings - PayPal Website Payments Pro Hosted Solution"
+"Payflow Pro","Payflow Pro"
+"Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)","Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)"
+"Vault Enabled","Vault Enabled"
+"Basic Settings - PayPal Payflow Pro","Basic Settings - PayPal Payflow Pro"
+"Vault Title","Vault Title"
+"Credit Card Settings","Credit Card Settings"
+"Allowed Credit Card Types","Allowed Credit Card Types"
 "
                     Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
                 ","
                     Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.
-                "
-CVV and AVS Settings,CVV and AVS Settings
-Reject Transaction if:,Reject Transaction if:
-AVS Street Does Not Match,AVS Street Does Not Match
-AVS Zip Does Not Match,AVS Zip Does Not Match
-Card Issuer Is Outside The United States,Card Issuer Is Outside The United States
-Card Security Code Does Not Match,Card Security Code Does Not Match
-Payflow Pro and Express Checkout,Payflow Pro and Express Checkout
+                "
+"CVV and AVS Settings","CVV and AVS Settings"
+"Reject Transaction if:","Reject Transaction if:"
+"AVS Street Does Not Match","AVS Street Does Not Match"
+"AVS Zip Does Not Match","AVS Zip Does Not Match"
+"Card Issuer Is Outside The United States","Card Issuer Is Outside The United States"
+"Card Security Code Does Not Match","Card Security Code Does Not Match"
+"Payflow Pro and Express Checkout","Payflow Pro and Express Checkout"
 "
                     <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
                                 <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
@@ -697,72 +697,72 @@ Payflow Pro and Express Checkout,Payflow Pro and Express Checkout
                                 Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
                                 The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
                                 or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
-                "
+                "
 "PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                             You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
                             <a href=""https://www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>","PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                             You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                            <a href=""https://www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>"
-Customize Smart Buttons,Customize Smart Buttons
-Checkout Page,Checkout Page
-Label,Label
-"The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.","The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR."
-Checkout,Checkout
-Pay,Pay
-Buy Now,Buy Now
-PayPal,PayPal
-Installment,Installment
-Mexico Installment Period,Mexico Installment Period
-Brazil Installment Period,Brazil Installment Period
-Layout,Layout
-Vertical,Vertical
-Horizontal,Horizontal
-Size,Size
-Responsive,Responsive
-Shape,Shape
-Pill,Pill
-Rectangle,Rectangle
-Color,Color
-Gold,Gold
-Blue,Blue
-Silver,Silver
-Black,Black
-Product Pages,Product Pages
-Cart Page,Cart Page
-Mini Cart,Mini Cart
-Features,Features
-"PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD.","PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD."
-PayPal Credit,PayPal Credit
-PayPal Guest Checkout Credit Card Icons,PayPal Guest Checkout Credit Card Icons
-Elektronisches Lastschriftverfahren - German ELV,Elektronisches Lastschriftverfahren - German ELV
-Please enter at least 0 and at most 65535,Please enter at least 0 and at most 65535
-Order is suspended as an account verification transaction is suspected to be fraudulent.,Order is suspended as an account verification transaction is suspected to be fraudulent.
-Payment can't be accepted since transaction was rejected by merchant.,Payment can't be accepted since transaction was rejected by merchant.
-"A successful payment transaction has already been completed. Please, check if the order has been placed.","A successful payment transaction has already been completed. Please, check if the order has been placed."
-Advertise PayPal PayLater,Advertise PayPal PayLater
-Enable PayPal PayLater,Enable PayPal PayLater
-Style Layout,Style Layout
-Logo Type,Logo Type
-Logo Position,Logo Position
-Text Color,Text Color
-Text Size,Text Size
-Ratio,Ratio
-White,White
-White No Border,White No Border
-Gray,Gray
-Left,Left
-Right,Right
-Top,Top
-Primary,Primary
-Alternative,Alternative
-Inline,Inline
-None,None
-Text,Text
-Flex,Flex
-"Display pay later messaging on your site for offers like Pay in 3, which lets customers pay with 3 interest- free monthly payments. We’ll show messages on your site to promote this feature for you. You may not promote pay later offers with any other content, marketing, or materials","Display pay later messaging on your site for offers like Pay in 3, which lets customers pay with 3 interest- free monthly payments. We’ll show messages on your site to promote this feature for you. You may not promote pay later offers with any other content, marketing, or materials"
-Enable PayPal PayLater Experience,Enable PayPal PayLater Experience
-"Recommended. <strong>Advertise PayPal Credit</strong> is deprecated. See PayPal PayLater details and list of supported regions <a href=https://developer.paypal.com/docs/business/pay-later/us/#eligibility"" target=""_blank"">here</a>.""","Recommended. <strong>Advertise PayPal Credit</strong> is deprecated. See PayPal PayLater details and list of supported regions <a href=https://developer.paypal.com/docs/business/pay-later/us/#eligibility"" target=""_blank"">here</a>.Recommended. <strong>Advertise PayPal Credit</strong> is deprecated. See PayPal PayLater details and list of supported regions <a href=""https://developer.paypal.com/docs/business/pay-later/us/#eligibility"" target=""_blank"">here</a>."""
-Monochrome,Monochrome
-Grayscale,Grayscale
-Sidebar,Sidebar
-Checkout Payment Step,Checkout Payment Step
\ No newline at end of file
+                            <a href=""https://www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>"
+"Customize Smart Buttons","Customize Smart Buttons"
+"Checkout Page","Checkout Page"
+"Label","Label"
+"The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.","The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR."
+"Checkout","Checkout"
+"Pay","Pay"
+"Buy Now","Buy Now"
+"PayPal","PayPal"
+"Installment","Installment"
+"Mexico Installment Period","Mexico Installment Period"
+"Brazil Installment Period","Brazil Installment Period"
+"Layout","Layout"
+"Vertical","Vertical"
+"Horizontal","Horizontal"
+"Size","Size"
+"Responsive","Responsive"
+"Shape","Shape"
+"Pill","Pill"
+"Rectangle","Rectangle"
+"Color","Color"
+"Gold","Gold"
+"Blue","Blue"
+"Silver","Silver"
+"Black","Black"
+"Product Pages","Product Pages"
+"Cart Page","Cart Page"
+"Mini Cart","Mini Cart"
+"Features","Features"
+"PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD.","PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD."
+"PayPal Credit","PayPal Credit"
+"PayPal Guest Checkout Credit Card Icons","PayPal Guest Checkout Credit Card Icons"
+"Elektronisches Lastschriftverfahren - German ELV","Elektronisches Lastschriftverfahren - German ELV"
+"Please enter at least 0 and at most 65535","Please enter at least 0 and at most 65535"
+"Order is suspended as an account verification transaction is suspected to be fraudulent.","Order is suspended as an account verification transaction is suspected to be fraudulent."
+"Payment can't be accepted since transaction was rejected by merchant.","Payment can't be accepted since transaction was rejected by merchant."
+"A successful payment transaction has already been completed. Please, check if the order has been placed.","A successful payment transaction has already been completed. Please, check if the order has been placed."
+"Advertise PayPal PayLater","Advertise PayPal PayLater"
+"Enable PayPal PayLater","Enable PayPal PayLater"
+"Style Layout","Style Layout"
+"Logo Type","Logo Type"
+"Logo Position","Logo Position"
+"Text Color","Text Color"
+"Text Size","Text Size"
+"Ratio","Ratio"
+"White","White"
+"White No Border","White No Border"
+"Gray","Gray"
+"Left","Left"
+"Right","Right"
+"Top","Top"
+"Primary","Primary"
+"Alternative","Alternative"
+"Inline","Inline"
+"None","None"
+"Text","Text"
+"Flex","Flex"
+"Display pay later messaging on your site for offers like Pay in 3, which lets customers pay with 3 interest- free monthly payments. We’ll show messages on your site to promote this feature for you. You may not promote pay later offers with any other content, marketing, or materials","Display pay later messaging on your site for offers like Pay in 3, which lets customers pay with 3 interest- free monthly payments. We’ll show messages on your site to promote this feature for you. You may not promote pay later offers with any other content, marketing, or materials"
+"Enable PayPal PayLater Experience","Enable PayPal PayLater Experience"
+"Recommended. <strong>Advertise PayPal Credit</strong> is deprecated. See PayPal PayLater details and list of supported regions <a href="https://developer.paypal.com/docs/business/pay-later/us/#eligibility" target="_blank">here</a>.","Recommended. <strong>Advertise PayPal Credit</strong> is deprecated. See PayPal PayLater details and list of supported regions <a href="https://developer.paypal.com/docs/business/pay-later/us/#eligibility" target="_blank">here</a>.Recommended. <strong>Advertise PayPal Credit</strong> is deprecated. See PayPal PayLater details and list of supported regions <a href="https://developer.paypal.com/docs/business/pay-later/us/#eligibility" target="_blank">here</a>."
+"Monochrome","Monochrome"
+"Grayscale","Grayscale"
+"Sidebar","Sidebar"
+"Checkout Payment Step","Checkout Payment Step"

From 61504b11d0795c68cb457b8b0a9c8145013f597a Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Wed, 3 Nov 2021 17:46:09 -0500
Subject: [PATCH 55/87] Allow configure Magento with env

 - add coverage by unit test
---
 .../Framework/App/DeploymentConfig.php        | 26 ++++++----
 .../App/Test/Unit/DeploymentConfigTest.php    | 50 +++++++++++++++++++
 2 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig.php
index 4aaabc8036c64..c3904d093d17d 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig.php
@@ -20,7 +20,8 @@
 class DeploymentConfig
 {
     private const MAGENTO_ENV_PREFIX = 'MAGENTO_DC_';
-    private const ENV_NAME_PATTERN = '~^%env\(\s*(?<name>\w+)\s*(,\s*"(?<default>[^"]+)")?\)%$~';
+    private const ENV_NAME_PATTERN = '~^#env\(\s*(?<name>\w+)\s*(,\s*"(?<default>[^"]+)")?\)$~';
+    private const OVERRIDE_KEY = self::MAGENTO_ENV_PREFIX . '_OVERRIDE';
 
     /**
      * Configuration reader
@@ -151,7 +152,7 @@ public function isDbAvailable()
      */
     private function getEnvOverride() : array
     {
-        $env = getenv(self::MAGENTO_ENV_PREFIX . '_OVERRIDE');
+        $env = getenv(self::OVERRIDE_KEY);
         return !empty($env) ? (json_decode($env, true) ?? []) : [];
     }
 
@@ -172,6 +173,19 @@ private function load()
             );
             // flatten data for config retrieval using get()
             $this->flatData = $this->flattenParams($this->data);
+
+            // allow reading values from env variables by convention
+            // MAGENTO_DC_{path}, like db/connection/default/host =>
+            // can be overwritten by MAGENTO_DC_DB__CONNECTION__DEFAULT__HOST
+            foreach (getenv() as $key => $value) {
+                if (false !== \strpos($key, self::MAGENTO_ENV_PREFIX)
+                    && $key !== self::OVERRIDE_KEY
+                ) {
+                    // convert MAGENTO_DC_DB__CONNECTION__DEFAULT__HOST into db/connection/default/host
+                    $flatKey = strtolower(str_replace([self::MAGENTO_ENV_PREFIX, '__'], ['', '/'], $key));
+                    $this->flatData[$flatKey] = $value;
+                }
+            }
         }
     }
 
@@ -210,17 +224,11 @@ private function flattenParams(array $params, $path = null, array &$flattenResul
             } else  {
                 // allow reading values from env variables
                 // value need to be specified in %env(NAME, "default value")% format
-                // like %env(DB_PASSWORD)%, %env(DB_NAME, "test")%
+                // like #env(DB_PASSWORD), #env(DB_NAME, "test")
                 if (preg_match(self::ENV_NAME_PATTERN, $param, $matches)) {
                     $param = getenv($matches['name']) ?: ($matches['default'] ?? null);
                 }
 
-                // allow reading values from env variables by convention
-                // MAGENTO_DC_{path}, like db/connection/default/host =>
-                // can be overwritten by MAGENTO_DC_DB__CONNECTION__DEFAULT__HOST
-                $envName = self::MAGENTO_ENV_PREFIX . strtoupper(str_replace(['/'], ['__'], $newPath));
-                $param = getenv($envName) ?: $param;
-
                 $flattenResult[$newPath] = $param;
             }
         }
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php
index 7a05b86ed050c..191a86c442f95 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php
@@ -147,6 +147,16 @@ public function testKeyCollision(array $data): void
         $object->get();
     }
 
+    protected function tearDown(): void
+    {
+        foreach (array_keys(getenv()) as $key) {
+            if (false !== \strpos($key, 'MAGENTO_DC')) {
+                putenv($key);
+            }
+        }
+        parent::tearDown();
+    }
+
     /**
      * @return array
      */
@@ -178,4 +188,44 @@ public function testIsDbAvailable(): void
         $this->_deploymentConfig->resetData();
         $this->assertTrue($this->_deploymentConfig->isDbAvailable());
     }
+
+    public function testNoEnvVariables()
+    {
+        $this->reader->expects($this->once())->method('load')->willReturn(['a'=>'b']);
+        $this->assertSame('b', $this->_deploymentConfig->get('a'));
+    }
+
+    public function testEnvVariables()
+    {
+        $this->reader->expects($this->once())->method('load')->willReturn([]);
+        putenv('MAGENTO_DC__OVERRIDE={"a": "c"}');
+        $this->assertSame('c', $this->_deploymentConfig->get('a'));
+    }
+
+    public function testEnvVariablesWithNoBaseConfig()
+    {
+        $this->reader->expects($this->once())->method('load')->willReturn(['a'=>'b']);
+        putenv('MAGENTO_DC_A=c');
+        putenv('MAGENTO_DC_B__B__B=D');
+        $this->assertSame('c', $this->_deploymentConfig->get('a'));
+        $this->assertSame('D', $this->_deploymentConfig->get('b/b/b'));
+    }
+
+    public function testEnvVariablesSubstitution()
+    {
+        $this->reader->expects($this->once())
+            ->method('load')
+            ->willReturn(
+                [
+                    'a'=>'#env(MAGENTO_DC____A)',
+                    'b'=>'#env(MAGENTO_DC____B, "test")',
+                    'c'=>'#env(MAGENTO_DC____D, "e$%^&")'
+                ]
+            );
+        putenv('MAGENTO_DC____A=c');
+        putenv('MAGENTO_DC____B=D');
+        $this->assertSame('c', $this->_deploymentConfig->get('a'));
+        $this->assertSame('D', $this->_deploymentConfig->get('b'), 'return value from env');
+        $this->assertSame('e$%^&', $this->_deploymentConfig->get('c'), 'return default value');
+    }
 }

From 419bcf512152b287bf8faec6520bf419536a5f82 Mon Sep 17 00:00:00 2001
From: engcom-Charlie <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 4 Nov 2021 14:34:50 +0530
Subject: [PATCH 56/87] 34148 Fixed the static test case issue

---
 app/code/Magento/Customer/Block/Widget/Dob.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/app/code/Magento/Customer/Block/Widget/Dob.php
index 919db404df175..e8051a9820769 100644
--- a/app/code/Magento/Customer/Block/Widget/Dob.php
+++ b/app/code/Magento/Customer/Block/Widget/Dob.php
@@ -422,8 +422,8 @@ public function getTranslatedCalendarConfigJson(): string
                 'monthNamesShort' => array_values(iterator_to_array($monthsData['format']['abbreviated'])),
                 'dayNames' => array_values(iterator_to_array($daysData['format']['wide'])),
                 'dayNamesShort' => array_values(iterator_to_array($daysData['format']['abbreviated'])),
-                'dayNamesMin' => array_values(iterator_to_array(
-                    ($daysData['format']['short']) ?: $daysData['format']['abbreviated'])),
+                'dayNamesMin' =>
+                 array_values(iterator_to_array(($daysData['format']['short']) ?: $daysData['format']['abbreviated'])),
             ]
         );
     }

From e644d97a1450ceaf8275cdaedbdaccf04b7489a8 Mon Sep 17 00:00:00 2001
From: Nishant Rana <glo04412@adobe.com>
Date: Mon, 8 Nov 2021 10:30:12 +0530
Subject: [PATCH 57/87] Enabled pay later option for all payment methods and
 relative countries

---
 .../Magento/Paypal/etc/adminhtml/system.xml   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Paypal/etc/adminhtml/system.xml b/app/code/Magento/Paypal/etc/adminhtml/system.xml
index db2890f04efdc..313e79b8e2d0b 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system.xml
@@ -51,8 +51,8 @@
             </group>
             <group id="payments_pro_hosted_solution_without_bml_and_paylater" extends="payments_pro_hosted_solution_without_bml">
                 <group id="pphs_required_settings">
-                    <field id="enable_paypal_paylater_experience" showInDefault="0" showInWebsite="0"/>
-                    <group id="pphs_advertise_paylater" showInDefault="0" showInWebsite="0"/>
+                    <field id="enable_paypal_paylater_experience" showInDefault="1" showInWebsite="1"/>
+                    <group id="pphs_advertise_paylater" showInDefault="1" showInWebsite="1"/>
                 </group>
             </group>
             <include path="Magento_Paypal::system/payments_pro_hosted_solution_with_express_checkout.xml"/>
@@ -204,9 +204,9 @@
                         </field>
                         <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
                         <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                        <field id="enable_paypal_paylater_experience" showInDefault="0" showInWebsite="0"/>
+                        <field id="enable_paypal_paylater_experience" showInDefault="1" showInWebsite="1"/>
                         <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                        <group id="advertise_paylater" showInDefault="0" showInWebsite="0"/>
+                        <group id="advertise_paylater" showInDefault="1" showInWebsite="1"/>
                     </group>
                     <group id="settings_ec" translate="label">
                         <label>Basic Settings - PayPal Website Payments Standard</label>
@@ -327,8 +327,8 @@
                             <config_path>payment/paypal_payment_pro/active</config_path>
                             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
                         </field>
-                        <field id="enable_paypal_paylater_experience" showInDefault="0" showInWebsite="0"/>
-                        <group id="paypal_payflow_advertise_paylater" showInDefault="0" showInWebsite="0"/>
+                        <field id="enable_paypal_paylater_experience" showInDefault="1" showInWebsite="1"/>
+                        <group id="paypal_payflow_advertise_paylater" showInDefault="1" showInWebsite="1"/>
                     </group>
                     <group id="settings_paypal_payflow">
                         <label>Basic Settings - PayPal Payments Pro</label>
@@ -336,17 +336,17 @@
                 </group>
                 <group id="paypal_payflowpro_ca" extends="payment_all_paypal/paypal_payflowpro" sortOrder="40">
                     <group id="paypal_payflow_required">
-                        <field id="enable_paypal_paylater_experience" showInDefault="0" showInWebsite="0"/>
-                        <group id="paypal_payflow_advertise_paylater" showInDefault="0" showInWebsite="0"/>
+                        <field id="enable_paypal_paylater_experience" showInDefault="1" showInWebsite="1"/>
+                        <group id="paypal_payflow_advertise_paylater" showInDefault="1" showInWebsite="1"/>
                     </group>
                 </group>
                 <group id="payflow_link_ca" extends="payment_all_paypal/payflow_link" sortOrder="50">
                     <group id="payflow_link_required">
                         <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
                         <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                        <field id="enable_paypal_paylater_experience" showInDefault="0" showInWebsite="0"/>
+                        <field id="enable_paypal_paylater_experience" showInDefault="1" showInWebsite="1"/>
                         <group id="payflow_link_advertise_bml" showInDefault="0" showInWebsite="0"/>
-                        <group id="payflow_link_advertise_paylater" showInDefault="0" showInWebsite="0"/>
+                        <group id="payflow_link_advertise_paylater" showInDefault="1" showInWebsite="1"/>
                     </group>
                 </group>
             </group>

From d7a8fdca0cd2f5fbebdcc86fa041ef714cad19e4 Mon Sep 17 00:00:00 2001
From: engcom-Charlie <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 8 Nov 2021 15:41:54 +0530
Subject: [PATCH 58/87] 34148 Fixed the static test case failure

---
 app/code/Magento/Customer/Block/Widget/Dob.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/app/code/Magento/Customer/Block/Widget/Dob.php
index e8051a9820769..8d737df9789f5 100644
--- a/app/code/Magento/Customer/Block/Widget/Dob.php
+++ b/app/code/Magento/Customer/Block/Widget/Dob.php
@@ -28,8 +28,6 @@ class Dob extends AbstractWidget
     const MAX_DATE_RANGE_KEY = 'date_range_max';
 
     /**
-     * Date inputs
-     *
      * @var array
      */
     protected $_dateInputs = [];

From 73c91982b6e50a115d2ecfec487817bf4662a46b Mon Sep 17 00:00:00 2001
From: glo5363 <glo05363@adobe.com>
Date: Mon, 8 Nov 2021 16:24:44 +0530
Subject: [PATCH 59/87] Changes for all merchant countries

---
 .../Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
index c36a1c1a53415..33cfcaacba4e0 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
@@ -31,6 +31,7 @@
                 <field id="api_cert" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_cert" />
                 <field id="api_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_wizard" />
                 <field id="sandbox_flag" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/sandbox_flag" />
+                <field id="buyer_country" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/buyer_country" />
                 <field id="use_proxy" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/use_proxy" />
                 <field id="proxy_host" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/proxy_host" />
                 <field id="proxy_port" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/proxy_port" />

From 900b536f83f28a42a6a4e513b8639f852049337c Mon Sep 17 00:00:00 2001
From: glo5363 <glo05363@adobe.com>
Date: Mon, 8 Nov 2021 16:24:44 +0530
Subject: [PATCH 60/87] Changes for all merchant countries

---
 app/code/Magento/Paypal/Model/SdkUrl.php                        | 2 +-
 .../etc/adminhtml/system/payments_pro_hosted_solution.xml       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/Model/SdkUrl.php b/app/code/Magento/Paypal/Model/SdkUrl.php
index 724674cde7a45..43c34f96b6aff 100644
--- a/app/code/Magento/Paypal/Model/SdkUrl.php
+++ b/app/code/Magento/Paypal/Model/SdkUrl.php
@@ -175,7 +175,7 @@ private function getClientId()
      *
      * @return string
      */
-    private function getBuyerCountry(): string
+    private function getBuyerCountry(): ?string
     {
         return (int)$this->config->getValue('sandbox_flag') ? $this->config->getValue('buyer_country') : '';
     }
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
index c36a1c1a53415..33cfcaacba4e0 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
@@ -31,6 +31,7 @@
                 <field id="api_cert" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_cert" />
                 <field id="api_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_wizard" />
                 <field id="sandbox_flag" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/sandbox_flag" />
+                <field id="buyer_country" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/buyer_country" />
                 <field id="use_proxy" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/use_proxy" />
                 <field id="proxy_host" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/proxy_host" />
                 <field id="proxy_port" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/proxy_port" />

From 6819ce2ccd62020195cc2826b1df83f5b297c408 Mon Sep 17 00:00:00 2001
From: Nishant Rana <glo04412@adobe.com>
Date: Mon, 8 Nov 2021 19:41:49 +0530
Subject: [PATCH 61/87] Static test issues cleared

---
 app/code/Magento/Paypal/etc/adminhtml/system.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Paypal/etc/adminhtml/system.xml b/app/code/Magento/Paypal/etc/adminhtml/system.xml
index 313e79b8e2d0b..920701a6d05b5 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system.xml
@@ -28,13 +28,13 @@
             <group id="other_paypal_payment_solutions" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Other PayPal Payment Solutions:</label>
                 <fieldset_css>paypal-top-section paypal-other-header</fieldset_css>
-                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
+                <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
             </group>
             <group id="other_payment_methods" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Other Payment Methods:</label>
                 <attribute type="expanded">1</attribute>
                 <fieldset_css>paypal-top-section payments-other-header</fieldset_css>
-                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
+                <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
             </group>
         </section>
         <section id="payment_all_paypal" showInDefault="0" showInWebsite="0" showInStore="0">

From e3e0fead62df5a60fa2cf19b180e43649e1c42bf Mon Sep 17 00:00:00 2001
From: Kate Kyzyma <kate@atwix.com>
Date: Wed, 3 Nov 2021 09:41:44 +0200
Subject: [PATCH 62/87] 
 Refactoring-AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest

---
 ...SubcategoryIsNotVisibleInNavigationTest.xml | 18 +++++++++++++-----
 ...ategoryIsNotVisibleInNavigationMenuTest.xml | 18 +++++++++++++-----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
index 7a99afa3dcba7..75f805bb99e04 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
@@ -33,18 +33,26 @@
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
         <!--Create subcategory under parent category -->
         <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
-        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}" stepKey="selectCategory"/>
-        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="selectCategory">
+            <argument name="category" value="$$createCategory$$"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoad"/>
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
         <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
         <checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
         <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
-        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="seeSuccessMessage">
+            <argument name="message" value="You saved the category."/>
+        </actionGroup>
         <!-- Verify Parent Category and Sub category is not visible in navigation menu -->
         <amOnPage url="$$createCategory.custom_attributes[url_key]$$/{{SimpleSubCategory.urlKey}}.html" stepKey="openCategoryStoreFrontPage"/>
         <waitForPageLoad stepKey="waitForCategoryStoreFrontPageToLoad"/>
-        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="dontSeeCategoryOnStoreNavigationBar"/>
-        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryOnStoreNavigation"/>
+        <actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="dontSeeCategoryOnStoreNavigationBar">
+            <argument name="categoryName" value="$$createCategory.name$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="dontSeeSubCategoryOnStoreNavigation">
+            <argument name="categoryName" value="{{SimpleSubCategory.name}}"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveCategoryAndSubcategoryIsNotVisibleInNavigationMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveCategoryAndSubcategoryIsNotVisibleInNavigationMenuTest.xml
index f361345478b53..97992c35b7316 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveCategoryAndSubcategoryIsNotVisibleInNavigationMenuTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveCategoryAndSubcategoryIsNotVisibleInNavigationMenuTest.xml
@@ -32,18 +32,26 @@
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
         <!--Create subcategory under parent category -->
         <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
-        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}" stepKey="selectCategory"/>
-        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="selectCategory">
+            <argument name="category" value="$$createCategory$$"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoad"/>
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
         <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
         <checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
         <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
-        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="seeSuccessMessage">
+            <argument name="message" value="You saved the category."/>
+        </actionGroup>
         <!-- Verify Parent Category and Sub category is not visible in navigation menu -->
         <amOnPage url="$$createCategory.custom_attributes[url_key]$$/{{SimpleSubCategory.urlKey}}.html" stepKey="openCategoryStoreFrontPage"/>
         <waitForPageLoad stepKey="waitForCategoryStoreFrontPageToLoad"/>
-        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="dontSeeCategoryOnStoreNavigationBar"/>
-        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryOnStoreNavigation"/>
+        <actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="dontSeeCategoryOnStoreNavigationBar">
+            <argument name="categoryName" value="$$createCategory.name$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="dontSeeSubCategoryOnStoreNavigation">
+            <argument name="categoryName" value="{{SimpleSubCategory.name}}"/>
+        </actionGroup>
     </test>
 </tests>

From 0934c4b5061262d01c7bd801215ece5c54a17e8f Mon Sep 17 00:00:00 2001
From: Nishant Rana <glo04412@adobe.com>
Date: Wed, 10 Nov 2021 22:30:41 +0530
Subject: [PATCH 63/87] Added paylater option for payflow pro

---
 .../adminhtml/system/paypal_payflowpro.xml    | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
index 8afc2a961fb74..7457dc8169dec 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
@@ -94,6 +94,89 @@
                     <group id="paypal_payflow_api_settings"/>
                 </requires>
             </field>
+            <field id="enable_paypal_paylater_experience" sortOrder="35" extends="payment_all_paypal/express_checkout/express_checkout_required/enable_paypal_paylater_experience"/>
+            <group id="paypal_payflow_advertise_paylater"  translate="label" showInDefault="1" showInWebsite="1" sortOrder="60">
+                <label>Advertise PayPal PayLater</label>
+                <field id="paylater_enabled" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/paylater_enabled" />
+                <depends>
+                    <field id="enable_paypal_paylater_experience">1</field>
+                </depends>
+                <group id="paypal_payflow_settings_paylater_homepage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+                    <label>Home Page</label>
+                    <depends>
+                        <field id="paylater_enabled">1</field>
+                    </depends>
+                    <field id="paylater_homepage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_homepage/paylater_homepage_display"/>
+                    <field id="paylater_homepage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_homepage/paylater_homepage_position"/>
+                    <field id="paylater_homepage_stylelayout" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_homepage/paylater_homepage_stylelayout"/>
+                    <field id="paylater_homepage_logotype" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_homepage/paylater_homepage_logotype"/>
+                    <field id="paylater_homepage_logoposition" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_homepage/paylater_homepage_logoposition"/>
+                    <field id="paylater_homepage_textcolor" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_homepage/paylater_homepage_textcolor"/>
+                    <field id="paylater_homepage_textsize" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_homepage/paylater_homepage_textsize"/>
+                    <field id="paylater_homepage_ratio" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_homepage/paylater_homepage_ratio"/>
+                    <field id="paylater_homepage_color" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_homepage/paylater_homepage_color"/>
+                </group>
+                <group id="paypal_payflow_settings_paylater_productpage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
+                    <label>Catalog Product Page</label>
+                    <depends>
+                        <field id="paylater_enabled">1</field>
+                    </depends>
+                    <field id="paylater_productpage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_productpage/paylater_productpage_display"/>
+                    <field id="paylater_productpage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_productpage/paylater_productpage_position"/>
+                    <field id="paylater_productpage_stylelayout" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_productpage/paylater_productpage_stylelayout"/>
+                    <field id="paylater_productpage_logotype" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_productpage/paylater_productpage_logotype"/>
+                    <field id="paylater_productpage_logoposition" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_productpage/paylater_productpage_logoposition"/>
+                    <field id="paylater_productpage_textcolor" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_productpage/paylater_productpage_textcolor"/>
+                    <field id="paylater_productpage_textsize" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_productpage/paylater_productpage_textsize"/>
+                    <field id="paylater_productpage_ratio" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_productpage/paylater_productpage_ratio"/>
+                    <field id="paylater_productpage_color" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_productpage/paylater_productpage_color"/>
+                </group>
+                <group id="paypal_payflow_settings_paylater_cartpage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
+                    <label>Checkout Cart Page</label>
+                    <depends>
+                        <field id="paylater_enabled">1</field>
+                    </depends>
+                    <field id="paylater_cartpage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_display"/>
+                    <field id="paylater_cartpage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_position"/>
+                    <field id="paylater_cartpage_stylelayout" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_stylelayout"/>
+                    <field id="paylater_cartpage_logotype" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_logotype"/>
+                    <field id="paylater_cartpage_logoposition" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_logoposition"/>
+                    <field id="paylater_cartpage_textcolor" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_textcolor"/>
+                    <field id="paylater_cartpage_textsize" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_textsize"/>
+                    <field id="paylater_cartpage_ratio" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_ratio"/>
+                    <field id="paylater_cartpage_color" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_cartpage/paylater_cartpage_color"/>
+                </group>
+                <group id="paypal_payflow_settings_paylater_checkout_payment" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
+                    <label>Checkout Payment Step</label>
+                    <depends>
+                        <field id="paylater_enabled">1</field>
+                    </depends>
+                    <field id="paylater_checkout_payment_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_checkout_payment/paylater_checkout_payment_display"/>
+                    <field id="paylater_checkout_payment_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_checkout_payment/paylater_checkout_payment_position"/>
+                    <field id="paylater_checkout_payment_stylelayout" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_checkout_payment/paylater_checkout_payment_stylelayout"/>
+                    <field id="paylater_checkout_payment_logotype" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_checkout_payment/paylater_checkout_payment_logotype"/>
+                    <field id="paylater_checkout_payment_logoposition" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_checkout_payment/paylater_checkout_payment_logoposition"/>
+                    <field id="paylater_checkout_payment_textcolor" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_checkout_payment/paylater_checkout_payment_textcolor"/>
+                    <field id="paylater_checkout_payment_textsize" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_checkout_payment/paylater_checkout_payment_textsize"/>
+                    <field id="paylater_checkout_payment_ratio" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_checkout_payment/paylater_checkout_payment_ratio"/>
+                    <field id="paylater_checkout_payment_color" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_checkout_payment/paylater_checkout_payment_color"/>
+                </group>
+                <group id="paypal_payflow_settings_paylater_categorypage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
+                    <label>Catalog Category Page</label>
+                    <depends>
+                        <field id="paylater_enabled">1</field>
+                    </depends>
+                    <field id="paylater_categorypage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_categorypage/paylater_categorypage_display"/>
+                    <field id="paylater_categorypage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_categorypage/paylater_categorypage_position"/>
+                    <field id="paylater_categorypage_stylelayout" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_categorypage/paylater_categorypage_stylelayout"/>
+                    <field id="paylater_categorypage_logotype" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_categorypage/paylater_categorypage_logotype"/>
+                    <field id="paylater_categorypage_logoposition" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_categorypage/paylater_categorypage_logoposition"/>
+                    <field id="paylater_categorypage_textcolor" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_categorypage/paylater_categorypage_textcolor"/>
+                    <field id="paylater_categorypage_textsize" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_categorypage/paylater_categorypage_textsize"/>
+                    <field id="paylater_categorypage_ratio" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_categorypage/paylater_categorypage_ratio"/>
+                    <field id="paylater_categorypage_color" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_paylater/settings_paylater_categorypage/paylater_categorypage_color"/>
+                </group>
+            </group>
         </group>
         <group id="settings_paypal_payflow" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
             <label>Basic Settings - PayPal Payflow Pro</label>

From 04e9260038cdd25cfe42bc955d0c251a32b0498e Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Thu, 11 Nov 2021 13:19:38 +0530
Subject: [PATCH 64/87] AC-1228::Add BN Code for PayLater Paypal SDK

---
 .../Magento/Paypal/Block/PayLater/Banner.php  | 14 +++++++++++-
 .../Paypal/Block/PayLater/LayoutProcessor.php | 22 +++++++++++++++----
 .../view/frontend/web/js/view/paylater.js     | 10 +++++----
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Paypal/Block/PayLater/Banner.php b/app/code/Magento/Paypal/Block/PayLater/Banner.php
index 426745e08c0b8..33fbf0c42adc4 100644
--- a/app/code/Magento/Paypal/Block/PayLater/Banner.php
+++ b/app/code/Magento/Paypal/Block/PayLater/Banner.php
@@ -11,6 +11,7 @@
 use Magento\Framework\View\Element\Template;
 use Magento\Paypal\Model\PayLaterConfig;
 use Magento\Paypal\Model\SdkUrl;
+use Magento\Paypal\Model\Config as PaypalConfig;
 
 /**
  * PayPal PayLater component block
@@ -38,23 +39,31 @@ class Banner extends Template
      */
     private $position = '';
 
+    /**
+     * @var PaypalConfig
+     */
+    private $paypalConfig;
+
     /**
      * @param Template\Context $context
      * @param PayLaterConfig $payLaterConfig
      * @param SdkUrl $sdkUrl
      * @param array $data
+     * @param PaypalConfig $paypalConfig
      */
     public function __construct(
         Template\Context $context,
         PayLaterConfig $payLaterConfig,
         SdkUrl $sdkUrl,
-        array $data = []
+        array $data = [],
+        PaypalConfig $paypalConfig
     ) {
         parent::__construct($context, $data);
         $this->payLaterConfig = $payLaterConfig;
         $this->sdkUrl = $sdkUrl;
         $this->placement = $data['placement'] ??  '';
         $this->position = $data['position'] ??  '';
+        $this->paypalConfig = $paypalConfig;
     }
 
     /**
@@ -85,6 +94,9 @@ public function getJsLayout()
         $displayAmount = $config['displayAmount'] ?? false;
         $config['displayAmount'] = !$displayAmount || $this->payLaterConfig->isPPBillingAgreementEnabled()
             ? false : true;
+        $config['dataAttributes'] = [
+            'data-partner-attribution-id' => $this->paypalConfig->getBuildNotationCode()
+        ];
 
         //Extend block component attributes with defaults
         $componentAttributes = $this->jsLayout['components']['payLater']['config']['attributes'] ?? [];
diff --git a/app/code/Magento/Paypal/Block/PayLater/LayoutProcessor.php b/app/code/Magento/Paypal/Block/PayLater/LayoutProcessor.php
index efa59bbb48182..835b4cb9531fa 100644
--- a/app/code/Magento/Paypal/Block/PayLater/LayoutProcessor.php
+++ b/app/code/Magento/Paypal/Block/PayLater/LayoutProcessor.php
@@ -11,6 +11,7 @@
 use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
 use Magento\Paypal\Model\PayLaterConfig;
 use Magento\Paypal\Model\SdkUrl;
+use Magento\Paypal\Model\Config as PaypalConfig;
 
 /**
  * PayLater Layout Processor
@@ -32,14 +33,24 @@ class LayoutProcessor implements LayoutProcessorInterface
      */
     private $sdkUrl;
 
+    /**
+     * @var PaypalConfig
+     */
+    private $paypalConfig;
+
     /**
      * @param PayLaterConfig $payLaterConfig
      * @param SdkUrl $sdkUrl
+     * @param PaypalConfig $paypalConfig
      */
-    public function __construct(PayLaterConfig $payLaterConfig, SdkUrl $sdkUrl)
-    {
-        $this->payLaterConfig = $payLaterConfig;
-        $this->sdkUrl = $sdkUrl;
+    public function __construct(
+        PayLaterConfig $payLaterConfig,
+        SdkUrl $sdkUrl,
+        PaypalConfig $paypalConfig
+    ) {
+        $this->payLaterConfig   = $payLaterConfig;
+        $this->sdkUrl           = $sdkUrl;
+        $this->paypalConfig     = $paypalConfig;
     }
 
     /**
@@ -75,6 +86,9 @@ public function process($jsLayout)
             $displayAmount = $config['displayAmount'] ?? false;
             $config['displayAmount'] = !$displayAmount || $this->payLaterConfig->isPPBillingAgreementEnabled()
                 ? false : true;
+            $config['dataAttributes'] = [
+                'data-partner-attribution-id' => $this->paypalConfig->getBuildNotationCode()
+            ];
 
             $attributes = $this->payLaterConfig->getSectionConfig(
                 PayLaterConfig::CHECKOUT_PAYMENT_PLACEMENT,
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/paylater.js b/app/code/Magento/Paypal/view/frontend/web/js/view/paylater.js
index 7d976865b91f8..089dfe82cec02 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/paylater.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/paylater.js
@@ -27,6 +27,7 @@ define([
             attributes: {
                 class: 'pay-later-message'
             },
+            dataAttributes: {},
             refreshSelector: '',
             displayAmount: false,
             amountComponentConfig: {
@@ -51,7 +52,7 @@ define([
             }
 
             if (this.sdkUrl !== '') {
-                this.loadPayPalSdk(this.sdkUrl)
+                this.loadPayPalSdk(this.sdkUrl, this.dataAttributes)
                     .then(this._setPayPalObject.bind(this));
             }
 
@@ -76,10 +77,11 @@ define([
         /**
          * Load PP SDK with preconfigured options
          *
-         * @param {String} sdkUrl
+         * @param {String} sdkUrl - the url of the PayPal SDK
+         * @param {Array} dataAttributes - Array of the Attributes for PayPal SDK Script tag
          */
-        loadPayPalSdk: function (sdkUrl) {
-            return paypalSdk(sdkUrl);
+        loadPayPalSdk: function (sdkUrl, dataAttributes) {
+            return paypalSdk(sdkUrl, dataAttributes);
         },
 
         /**

From 9970d5a888dbfce71d30e36bf9b86e717f615667 Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Thu, 11 Nov 2021 16:55:18 +0530
Subject: [PATCH 65/87] Resolved Paypal merge Conflicts

---
 .../Paypal/Test/Unit/Model/_files/expected_url_config.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
index a6ee3e029606d..63d37f730d59e 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
@@ -175,15 +175,16 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                     'client-id' => 'sb',
                     'locale' => 'en_BR',
                     'currency' => 'USD',
+                    'enable-funding' => implode(',', ['venmo', 'paylater']),
                     'buyer-country' => 'US',
                     'commit' => 'false',
                     'intent' => 'authorize',
                     'merchant-id' => 'merchant',
                     'disable-funding' => implode(
                         ',',
-                        ['credit', 'sepa', 'venmo', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
+                        ['credit', 'sepa', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
                     ),
-                    'components' => implode(',', ['messages', 'buttons'])
+                    'components' => implode(',', ['messages', 'buttons']),
                 ]
             )
         ]
@@ -200,12 +201,13 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                     'client-id' => 'sb',
                     'locale' => 'en_BR',
                     'currency' => 'USD',
+                    'enable-funding' => implode(',', ['venmo', 'paylater']),
                     'commit' => 'false',
                     'intent' => 'authorize',
                     'merchant-id' => 'merchant',
                     'disable-funding' => implode(
                         ',',
-                        ['credit', 'sepa', 'venmo', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
+                        ['credit', 'sepa', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
                     ),
                     'components' => implode(',', ['messages', 'buttons']),
                 ]

From b293533514739460a2087c0ee8f4bda90dec9302 Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Thu, 11 Nov 2021 19:45:43 +0530
Subject: [PATCH 66/87] Resolved Paypal Unit Test

---
 .../Paypal/Test/Unit/Model/_files/expected_url_config.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
index 63d37f730d59e..1fb71dbc5ac32 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php
@@ -175,8 +175,8 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                     'client-id' => 'sb',
                     'locale' => 'en_BR',
                     'currency' => 'USD',
-                    'enable-funding' => implode(',', ['venmo', 'paylater']),
                     'buyer-country' => 'US',
+                    'enable-funding' => implode(',', ['venmo', 'paylater']),
                     'commit' => 'false',
                     'intent' => 'authorize',
                     'merchant-id' => 'merchant',

From 6cecd93307d572c1f739650e09e90ca74b4f1902 Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Thu, 11 Nov 2021 20:51:16 +0530
Subject: [PATCH 67/87] AC-1228::Fixed Tests issues

---
 app/code/Magento/Paypal/Block/PayLater/Banner.php          | 6 +++---
 app/code/Magento/Paypal/Block/PayLater/LayoutProcessor.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Paypal/Block/PayLater/Banner.php b/app/code/Magento/Paypal/Block/PayLater/Banner.php
index 33fbf0c42adc4..cbe762635bd31 100644
--- a/app/code/Magento/Paypal/Block/PayLater/Banner.php
+++ b/app/code/Magento/Paypal/Block/PayLater/Banner.php
@@ -48,15 +48,15 @@ class Banner extends Template
      * @param Template\Context $context
      * @param PayLaterConfig $payLaterConfig
      * @param SdkUrl $sdkUrl
-     * @param array $data
      * @param PaypalConfig $paypalConfig
+     * @param array $data
      */
     public function __construct(
         Template\Context $context,
         PayLaterConfig $payLaterConfig,
         SdkUrl $sdkUrl,
-        array $data = [],
-        PaypalConfig $paypalConfig
+        PaypalConfig $paypalConfig,
+        array $data = []
     ) {
         parent::__construct($context, $data);
         $this->payLaterConfig = $payLaterConfig;
diff --git a/app/code/Magento/Paypal/Block/PayLater/LayoutProcessor.php b/app/code/Magento/Paypal/Block/PayLater/LayoutProcessor.php
index 835b4cb9531fa..7fe18cbfd96c7 100644
--- a/app/code/Magento/Paypal/Block/PayLater/LayoutProcessor.php
+++ b/app/code/Magento/Paypal/Block/PayLater/LayoutProcessor.php
@@ -54,14 +54,14 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process($jsLayout)
     {
         if (!$this->payLaterConfig->isEnabled(PayLaterConfig::CHECKOUT_PAYMENT_PLACEMENT)) {
             unset($jsLayout['components']['checkout']['children']['steps']['children']['billing-step']
-                ['children']['payment']['children']['payments-list']['children']['paypal-method-extra-content']['children']
-                ['paylater-place-order']);
+                ['children']['payment']['children']['payments-list']['children']['paypal-method-extra-content']
+                ['children']['paylater-place-order']);
 
             return $jsLayout;
         }

From 84db731eba9f9db47ec68bbfc9dbfa0e457ac660 Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Thu, 11 Nov 2021 23:36:41 +0530
Subject: [PATCH 68/87] AC-1228::Fixed Tests issues

---
 app/code/Magento/Paypal/Block/PayLater/Banner.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Paypal/Block/PayLater/Banner.php b/app/code/Magento/Paypal/Block/PayLater/Banner.php
index cbe762635bd31..5638b1e33bcff 100644
--- a/app/code/Magento/Paypal/Block/PayLater/Banner.php
+++ b/app/code/Magento/Paypal/Block/PayLater/Banner.php
@@ -12,6 +12,7 @@
 use Magento\Paypal\Model\PayLaterConfig;
 use Magento\Paypal\Model\SdkUrl;
 use Magento\Paypal\Model\Config as PaypalConfig;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * PayPal PayLater component block
@@ -48,22 +49,23 @@ class Banner extends Template
      * @param Template\Context $context
      * @param PayLaterConfig $payLaterConfig
      * @param SdkUrl $sdkUrl
-     * @param PaypalConfig $paypalConfig
      * @param array $data
+     * @param PaypalConfig $paypalConfig
      */
     public function __construct(
         Template\Context $context,
         PayLaterConfig $payLaterConfig,
         SdkUrl $sdkUrl,
-        PaypalConfig $paypalConfig,
-        array $data = []
+        array $data = [],
+        PaypalConfig $paypalConfig = null
     ) {
         parent::__construct($context, $data);
         $this->payLaterConfig = $payLaterConfig;
         $this->sdkUrl = $sdkUrl;
         $this->placement = $data['placement'] ??  '';
         $this->position = $data['position'] ??  '';
-        $this->paypalConfig = $paypalConfig;
+        $this->paypalConfig = $paypalConfig ?: ObjectManager::getInstance()
+            ->get(PaypalConfig::class);
     }
 
     /**

From 40a0f134b9a3d34c9efa93b475c2938f4c3b24d6 Mon Sep 17 00:00:00 2001
From: Aakash Kumar <aakashk@adobe.com>
Date: Fri, 12 Nov 2021 10:19:10 -0600
Subject: [PATCH 69/87] MCP-792: Wrong error message is sent in email if order
 is rejected because of disabled product

---
 .../Model/GuestPaymentInformationManagement.php      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
index 0ca398b73a08b..7c77a7e787aee 100644
--- a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
@@ -120,6 +120,14 @@ public function savePaymentInformationAndPlaceOrder(
             //Have to do this hack because of savePaymentInformation() plugins.
             $this->saveRateLimitDisabled = true;
             $this->savePaymentInformation($cartId, $email, $paymentMethod, $billingAddress);
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            $this->getLogger()->critical(
+                'Placing an order with quote_id ' . $cartId . ' is failed: ' . $e->getMessage()
+            );
+            throw new CouldNotSaveException(
+                __($e->getMessage()),
+                $e
+            );
         } finally {
             $this->saveRateLimitDisabled = false;
         }
@@ -176,6 +184,10 @@ public function savePaymentInformation(
         }
         $this->limitShippingCarrier($quote);
 
+        if (!$quote->getItemsQty()) {
+            throw new CouldNotSaveException(__('Some of the products are disabled.'));
+        }
+
         $this->paymentMethodManagement->set($cartId, $paymentMethod);
         return true;
     }

From 97936d32a3baca2156f01c72fba084c15f207487 Mon Sep 17 00:00:00 2001
From: Aakash Kumar <aakashk@adobe.com>
Date: Fri, 12 Nov 2021 13:11:20 -0600
Subject: [PATCH 70/87] MCP-792: Wrong error message is sent in email if order
 is rejected because of disabled product

---
 .../Unit/Model/GuestPaymentInformationManagementTest.php     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
index b4cab724b0ef3..867cad6b58b75 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
@@ -180,6 +180,7 @@ public function testSavePaymentInformationWithoutBillingAddress()
         $paymentMock = $this->getMockForAbstractClass(PaymentInterface::class);
         $billingAddressMock = $this->getMockForAbstractClass(AddressInterface::class);
         $quoteMock = $this->createMock(Quote::class);
+        $quoteMock->expects($this->any())->method('getItemsQty')->willReturn(1);
 
         $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf();
 
@@ -210,6 +211,7 @@ public function testSavePaymentInformationAndPlaceOrderWithLocalizedException()
 
         $quoteMock = $this->createMock(Quote::class);
         $quoteMock->method('getBillingAddress')->willReturn($billingAddressMock);
+        $quoteMock->expects($this->any())->method('getItemsQty')->willReturn(1);
         $this->cartRepositoryMock->method('getActive')->with($cartId)->willReturn($quoteMock);
 
         $quoteIdMask = $this->getMockBuilder(QuoteIdMask::class)
@@ -266,6 +268,9 @@ private function getMockForAssignBillingAddress(
         $this->cartRepositoryMock->method('getActive')
             ->with($cartId)
             ->willReturn($quote);
+        $quote->expects($this->any())
+            ->method('getItemsQty')
+            ->willReturn(1);
         $quote->expects($this->any())
             ->method('getBillingAddress')
             ->willReturn($quoteBillingAddress);

From 18601a09f6b8c4171f63af106ad72c8e99208239 Mon Sep 17 00:00:00 2001
From: Aakash Kumar <aakashk@adobe.com>
Date: Mon, 15 Nov 2021 12:13:02 -0600
Subject: [PATCH 71/87] MCP-792: Wrong error message is sent in email if order
 is rejected because of disabled product

---
 .../Checkout/Model/GuestPaymentInformationManagement.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
index 7c77a7e787aee..2a43128109b17 100644
--- a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
@@ -120,7 +120,7 @@ public function savePaymentInformationAndPlaceOrder(
             //Have to do this hack because of savePaymentInformation() plugins.
             $this->saveRateLimitDisabled = true;
             $this->savePaymentInformation($cartId, $email, $paymentMethod, $billingAddress);
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+        } catch (\Magento\Framework\Exception\CouldNotSaveException $e) {
             $this->getLogger()->critical(
                 'Placing an order with quote_id ' . $cartId . ' is failed: ' . $e->getMessage()
             );
@@ -184,7 +184,7 @@ public function savePaymentInformation(
         }
         $this->limitShippingCarrier($quote);
 
-        if (!$quote->getItemsQty()) {
+        if (!(int)$quote->getItemsQty()) {
             throw new CouldNotSaveException(__('Some of the products are disabled.'));
         }
 

From 3a317e2ccde1001a2521efdf8882500b8bc25537 Mon Sep 17 00:00:00 2001
From: Aakash Kumar <aakashk@adobe.com>
Date: Mon, 15 Nov 2021 12:57:32 -0600
Subject: [PATCH 72/87] MCP-792: Wrong error message is sent in email if order
 is rejected because of disabled product

---
 .../GuestPaymentInformationManagementTest.php | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
index 867cad6b58b75..8ab773f077671 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
@@ -233,6 +233,37 @@ public function testSavePaymentInformationAndPlaceOrderWithLocalizedException()
         $this->model->savePaymentInformationAndPlaceOrder($cartId, $email, $paymentMock, $billingAddressMock);
     }
 
+    public function testSavePaymentInformationAndPlaceOrderWithDisabledProduct()
+    {
+        $this->expectException('Magento\Framework\Exception\CouldNotSaveException');
+        $this->expectExceptionMessage('Some of the products are disabled.');
+        $cartId = 100;
+        $email = 'email@magento.com';
+        $paymentMock = $this->getMockForAbstractClass(PaymentInterface::class);
+        $billingAddressMock = $this->getMockForAbstractClass(AddressInterface::class);
+
+        $quoteMock = $this->createMock(Quote::class);
+        $quoteMock->method('getBillingAddress')->willReturn($billingAddressMock);
+        $quoteMock->expects($this->any())->method('getItemsQty')->willReturn(0);
+        $this->cartRepositoryMock->method('getActive')->with($cartId)->willReturn($quoteMock);
+
+        $quoteIdMask = $this->getMockBuilder(QuoteIdMask::class)
+            ->addMethods(['getQuoteId'])
+            ->onlyMethods(['load'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->quoteIdMaskFactoryMock->method('create')->willReturn($quoteIdMask);
+        $quoteIdMask->method('load')->with($cartId, 'masked_id')->willReturnSelf();
+        $quoteIdMask->method('getQuoteId')->willReturn($cartId);
+
+        $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf();
+
+        $this->paymentMethodManagementMock->expects($this->never())->method('set')->with($cartId, $paymentMock);
+        $phrase = new Phrase(__('Some of the products are disabled.'));
+        $exception = new CouldNotSaveException($phrase);
+        $this->model->savePaymentInformationAndPlaceOrder($cartId, $email, $paymentMock, $billingAddressMock);
+    }
+
     /**
      * @param int $cartId
      * @param MockObject $billingAddressMock

From 765e6c90ce4117ebc2e06f6a517a67326813ada3 Mon Sep 17 00:00:00 2001
From: Aakash Kumar <aakashk@adobe.com>
Date: Mon, 15 Nov 2021 13:08:12 -0600
Subject: [PATCH 73/87] MCP-792: Wrong error message is sent in email if order
 is rejected because of disabled product

---
 .../Test/Unit/Model/GuestPaymentInformationManagementTest.php   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
index 8ab773f077671..d757a396f4c7d 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
@@ -259,8 +259,6 @@ public function testSavePaymentInformationAndPlaceOrderWithDisabledProduct()
         $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf();
 
         $this->paymentMethodManagementMock->expects($this->never())->method('set')->with($cartId, $paymentMock);
-        $phrase = new Phrase(__('Some of the products are disabled.'));
-        $exception = new CouldNotSaveException($phrase);
         $this->model->savePaymentInformationAndPlaceOrder($cartId, $email, $paymentMock, $billingAddressMock);
     }
 

From bdbb153998bdd69553a4ef3c26a0ffe32d40c460 Mon Sep 17 00:00:00 2001
From: Aakash Kumar <aakashk@adobe.com>
Date: Mon, 15 Nov 2021 13:22:16 -0600
Subject: [PATCH 74/87] MCP-792: Wrong error message is sent in email if order
 is rejected because of disabled product

---
 .../Checkout/Model/GuestPaymentInformationManagement.php  | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
index 2a43128109b17..461a12c87aeb3 100644
--- a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
@@ -120,14 +120,6 @@ public function savePaymentInformationAndPlaceOrder(
             //Have to do this hack because of savePaymentInformation() plugins.
             $this->saveRateLimitDisabled = true;
             $this->savePaymentInformation($cartId, $email, $paymentMethod, $billingAddress);
-        } catch (\Magento\Framework\Exception\CouldNotSaveException $e) {
-            $this->getLogger()->critical(
-                'Placing an order with quote_id ' . $cartId . ' is failed: ' . $e->getMessage()
-            );
-            throw new CouldNotSaveException(
-                __($e->getMessage()),
-                $e
-            );
         } finally {
             $this->saveRateLimitDisabled = false;
         }

From 544f04410d4542f49b1dd1d712f8248a4e497b92 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Mon, 15 Nov 2021 13:51:43 -0600
Subject: [PATCH 75/87] magento-engcom/magento2ce#4271: Fixed code style

---
 .../Magento/CatalogWidget/Model/Rule/Condition/Product.php  | 4 +---
 .../Sales/view/frontend/templates/order/print/invoice.phtml | 1 +
 .../web/css/source/actions/_actions-multiselect.less        | 5 ++++-
 lib/internal/Magento/Framework/Filesystem/Glob.php          | 6 +++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
index 326d6874db80f..41f23d9c6dfbd 100644
--- a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
@@ -22,7 +22,7 @@
 class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
 {
     /**
-     * {@inheritdoc}
+     * @var string
      */
     protected $elementName = 'parameters';
 
@@ -32,8 +32,6 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
     protected $joinedAttributes = [];
 
     /**
-     * Store manager
-     *
      * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
index c4dfa88eacfaa..065af2791a77d 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// @codingStandardsIgnoreFile
 ?>
 <?php $_order = $block->getOrder() ?>
 <?php $_invoice = $block->getInvoice() ?>
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
index 16cfe206f3e75..c3cbffe4e8c4f 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
@@ -11,6 +11,9 @@
 //  Variables
 //  _____________________________________________
 
+/**
+ * @codingStandardsIgnoreStart
+ */
 @action-multiselect-menu-item__padding: 1rem;
 @action-multiselect-menu-item__hover__background-color: @color-gray89;
 @action-multiselect-menu-item__selected__background-color: @color-blue-clear-sky;
@@ -287,7 +290,7 @@
             &:active {
                 padding: 0;
                 transform: scale(.9);
-                
+
                 &:before {
                     font-size: 1em;
                 }
diff --git a/lib/internal/Magento/Framework/Filesystem/Glob.php b/lib/internal/Magento/Framework/Filesystem/Glob.php
index d43ce1ba244df..efd5770775ad0 100644
--- a/lib/internal/Magento/Framework/Filesystem/Glob.php
+++ b/lib/internal/Magento/Framework/Filesystem/Glob.php
@@ -14,9 +14,13 @@
  */
 class Glob extends LaminasGlob
 {
+    /**
+     * @var array
+     */
     private static $cache = [];
+
     /**
-     * Find pathnames matching a pattern.
+     * Find path names matching a pattern.
      *
      * @param string $pattern
      * @param int $flags

From ba2abd944351a6c30ea6d8bdfdd44568f6ea2d8a Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Tue, 16 Nov 2021 14:14:47 +0530
Subject: [PATCH 76/87] Fixed BN Code issue related to all Scirpts

---
 .../view/frontend/web/js/in-context/paypal-sdk.js   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
index 006be094319ce..1de0dc27b7d4a 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
@@ -25,14 +25,19 @@ define([
                     exports: 'paypal'
                 }
             },
+            attributes: {
+                "paypalSdk": dataAttributes
+            },
 
             /**
              * Add attributes under Paypal SDK Script tag
              */
-            onNodeCreated: function (node) {
-                $.each(dataAttributes, function (index, elem) {
-                    node.setAttribute(index, elem);
-                });
+            onNodeCreated: function(node, config, name){
+                if(config.attributes && config.attributes[name]){
+                    $.each(dataAttributes, function (index, elem) {
+                        node.setAttribute(index, elem);
+                    });
+                }
             }
         });
 

From 1e6f9e41e3517caad3d23131abd3d1c436dc46bb Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Tue, 16 Nov 2021 14:19:34 +0530
Subject: [PATCH 77/87] Fixed BN Code issue related to all Scirpts

---
 .../Paypal/view/frontend/web/js/in-context/paypal-sdk.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
index 1de0dc27b7d4a..31bea612bc7b0 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
@@ -26,7 +26,7 @@ define([
                 }
             },
             attributes: {
-                "paypalSdk": dataAttributes
+                'paypalSdk': dataAttributes
             },
 
             /**

From 452d3fc34951a169bed2f7cd8af3f46e8b648ada Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Tue, 16 Nov 2021 14:35:28 +0530
Subject: [PATCH 78/87] Fixed Indentation

---
 app/code/Magento/Paypal/Block/PayLater/LayoutProcessor.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Paypal/Block/PayLater/LayoutProcessor.php b/app/code/Magento/Paypal/Block/PayLater/LayoutProcessor.php
index 7fe18cbfd96c7..2fed90667c107 100644
--- a/app/code/Magento/Paypal/Block/PayLater/LayoutProcessor.php
+++ b/app/code/Magento/Paypal/Block/PayLater/LayoutProcessor.php
@@ -9,6 +9,7 @@
 namespace Magento\Paypal\Block\PayLater;
 
 use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Paypal\Model\PayLaterConfig;
 use Magento\Paypal\Model\SdkUrl;
 use Magento\Paypal\Model\Config as PaypalConfig;
@@ -48,9 +49,9 @@ public function __construct(
         SdkUrl $sdkUrl,
         PaypalConfig $paypalConfig
     ) {
-        $this->payLaterConfig   = $payLaterConfig;
-        $this->sdkUrl           = $sdkUrl;
-        $this->paypalConfig     = $paypalConfig;
+        $this->payLaterConfig = $payLaterConfig;
+        $this->sdkUrl = $sdkUrl;
+        $this->paypalConfig = $paypalConfig;
     }
 
     /**

From 5e720cc656db370d0e8a11077077a7231453b4ca Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Tue, 16 Nov 2021 17:11:15 +0530
Subject: [PATCH 79/87] Fixed Static Tests Issue

---
 .../Paypal/view/frontend/web/js/in-context/paypal-sdk.js      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
index 31bea612bc7b0..60ba9c3035730 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
@@ -32,8 +32,8 @@ define([
             /**
              * Add attributes under Paypal SDK Script tag
              */
-            onNodeCreated: function(node, config, name){
-                if(config.attributes && config.attributes[name]){
+            onNodeCreated: function (node, config, name) {
+                if(config.attributes && config.attributes[name]) {
                     $.each(dataAttributes, function (index, elem) {
                         node.setAttribute(index, elem);
                     });

From c5144b053621576ec1030b841a6820ad82905352 Mon Sep 17 00:00:00 2001
From: Rimple Saini <glo62131@adobe.com>
Date: Tue, 16 Nov 2021 18:34:11 +0530
Subject: [PATCH 80/87] Fixed Static Tests Issue

---
 .../Paypal/view/frontend/web/js/in-context/paypal-sdk.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
index 60ba9c3035730..94c6f56157869 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js
@@ -33,7 +33,7 @@ define([
              * Add attributes under Paypal SDK Script tag
              */
             onNodeCreated: function (node, config, name) {
-                if(config.attributes && config.attributes[name]) {
+                if (config.attributes && config.attributes[name]) {
                     $.each(dataAttributes, function (index, elem) {
                         node.setAttribute(index, elem);
                     });

From 37b7141942752cc0f9917aa99310bfef1031e3d9 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Thu, 18 Nov 2021 12:32:31 +0000
Subject: [PATCH 81/87] AC-491: Updated setup integration tests for MySQL
 8.0.27

---
 .../constraint_modification.mysql8.php            |  6 +++---
 .../declarative_installer/rollback.mysql8.php     |  6 +++---
 .../table_removal.mysql8.php                      |  2 +-
 .../declarative_installer/table_rename.mysql8.php | 15 +++++++++++++++
 .../fixture/shards.mysql8.php                     |  8 ++++----
 .../disabling_tables.mysql8.php                   |  2 +-
 6 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_rename.mysql8.php

diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/constraint_modification.mysql8.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/constraint_modification.mysql8.php
index 6f0ed86f942bc..c24d9a52823bd 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/constraint_modification.mysql8.php
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/constraint_modification.mysql8.php
@@ -9,7 +9,7 @@
   `int_auto_increment_with_nullable` int unsigned NOT NULL AUTO_INCREMENT,
   `int_disabled_auto_increment` smallint unsigned DEFAULT \'0\',
   UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
     'reference_table' => 'CREATE TABLE `reference_table` (
   `tinyint_ref` tinyint NOT NULL AUTO_INCREMENT,
   `tinyint_without_padding` tinyint NOT NULL DEFAULT \'0\',
@@ -25,7 +25,7 @@
   `smallint_ref` smallint NOT NULL DEFAULT \'0\',
   PRIMARY KEY (`tinyint_ref`,`smallint_ref`),
   UNIQUE KEY `REFERENCE_TABLE_SMALLINT_REF` (`smallint_ref`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
     'test_table' => 'CREATE TABLE `test_table` (
   `smallint` smallint DEFAULT NULL,
   `tinyint` tinyint DEFAULT NULL,
@@ -53,5 +53,5 @@
   CONSTRAINT `FK_FB77604C299EB8612D01E4AF8D9931F2` FOREIGN KEY (`integer_main`) REFERENCES `auto_increment_test` (`int_auto_increment_with_nullable`) ON DELETE CASCADE,
   CONSTRAINT `TEST_TABLE_SMALLINT_MAIN_REFERENCE_TABLE_SMALLINT_REF` FOREIGN KEY (`smallint_main`) REFERENCES `reference_table` (`smallint_ref`) ON DELETE CASCADE,
   CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`) REFERENCES `reference_table` (`tinyint_ref`) ON DELETE SET NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
 ];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/rollback.mysql8.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/rollback.mysql8.php
index fca11331318d6..57b70edd9e3f2 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/rollback.mysql8.php
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/rollback.mysql8.php
@@ -12,16 +12,16 @@
   `store_owner_id` smallint DEFAULT NULL COMMENT \'Store Owner Reference\',
   KEY `STORE_STORE_OWNER_ID_STORE_OWNER_OWNER_ID` (`store_owner_id`),
   CONSTRAINT `STORE_STORE_OWNER_ID_STORE_OWNER_OWNER_ID` FOREIGN KEY (`store_owner_id`) REFERENCES `store_owner` (`owner_id`) ON DELETE SET NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
         'store_owner' => 'CREATE TABLE `store_owner` (
   `owner_id` smallint NOT NULL AUTO_INCREMENT,
   `store_owner_name` varchar(255) DEFAULT NULL COMMENT \'Store Owner Name\',
   PRIMARY KEY (`owner_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT=\'Store owner information\''
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT=\'Store owner information\''
     ],
     'after' => [
         'store' => 'CREATE TABLE `store` (
   `store_owner` varchar(255) DEFAULT NULL COMMENT \'Store Owner Name\'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3'
     ]
 ];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_removal.mysql8.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_removal.mysql8.php
index 6eef0bbc1603a..7274c33533545 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_removal.mysql8.php
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_removal.mysql8.php
@@ -8,5 +8,5 @@
   `int_auto_increment_with_nullable` int unsigned NOT NULL AUTO_INCREMENT,
   `int_disabled_auto_increment` smallint unsigned DEFAULT \'0\',
   UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3'
 ];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_rename.mysql8.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_rename.mysql8.php
new file mode 100644
index 0000000000000..cb8f53d499a50
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_rename.mysql8.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+return [
+    'before' => 'CREATE TABLE `some_table` (
+  `some_column` varchar(255) DEFAULT NULL COMMENT \'Some Column Name\'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
+    'after' => 'CREATE TABLE `some_table_renamed` (
+  `some_column` varchar(255) DEFAULT NULL COMMENT \'Some Column Name\'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
+];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule2/fixture/shards.mysql8.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule2/fixture/shards.mysql8.php
index a461b42dacb9e..82ae507945e38 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule2/fixture/shards.mysql8.php
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule2/fixture/shards.mysql8.php
@@ -8,12 +8,12 @@
   `smallint` smallint NOT NULL AUTO_INCREMENT,
   `varchar` varchar(254) DEFAULT NULL,
   PRIMARY KEY (`smallint`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
     'test_table_two' => 'CREATE TABLE `test_table_two` (
   `smallint` smallint NOT NULL AUTO_INCREMENT,
   `varchar` varchar(254) DEFAULT NULL,
   PRIMARY KEY (`smallint`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
     'reference_table' => 'CREATE TABLE `reference_table` (
   `tinyint_ref` tinyint NOT NULL AUTO_INCREMENT,
   `tinyint_without_padding` tinyint NOT NULL DEFAULT \'0\',
@@ -27,10 +27,10 @@
   `bigint_default_nullable` bigint unsigned DEFAULT \'1\',
   `bigint_not_default_not_nullable` bigint unsigned NOT NULL,
   PRIMARY KEY (`tinyint_ref`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
     'auto_increment_test' => 'CREATE TABLE `auto_increment_test` (
   `int_auto_increment_with_nullable` int unsigned NOT NULL AUTO_INCREMENT,
   `int_disabled_auto_increment` smallint unsigned DEFAULT \'0\',
   UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3'
 ];
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/fixture/declarative_installer/disabling_tables.mysql8.php b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/fixture/declarative_installer/disabling_tables.mysql8.php
index bd1f8a215297c..9ca6fcbc22751 100644
--- a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/fixture/declarative_installer/disabling_tables.mysql8.php
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/fixture/declarative_installer/disabling_tables.mysql8.php
@@ -10,5 +10,5 @@
   `int_auto_increment_with_nullable` int unsigned NOT NULL AUTO_INCREMENT,
   `int_disabled_auto_increment` smallint unsigned DEFAULT \'0\',
   UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3'
 ];

From 1aa23ed1ac5cbfd74b4456cb6c4056e90cc6c33d Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Thu, 18 Nov 2021 11:59:09 -0600
Subject: [PATCH 82/87] Fix formatting

---
 lib/internal/Magento/Framework/App/DeploymentConfig.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig.php
index c3904d093d17d..c4e9ce1838692 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig.php
@@ -146,6 +146,7 @@ public function isDbAvailable()
 
     /**
      * Get additional configuration from env variable MAGENTO_DC__OVERRIDE
+     *
      * Data should be JSON encoded
      *
      * @return array
@@ -221,7 +222,7 @@ private function flattenParams(array $params, $path = null, array &$flattenResul
             if (is_array($param)) {
                 $flattenResult[$newPath] = $param;
                 $this->flattenParams($param, $newPath, $flattenResult);
-            } else  {
+            } else {
                 // allow reading values from env variables
                 // value need to be specified in %env(NAME, "default value")% format
                 // like #env(DB_PASSWORD), #env(DB_NAME, "test")

From c241e11adf59baeca9d9e66cdbd726e4b0b88b21 Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Thu, 18 Nov 2021 15:00:03 -0600
Subject: [PATCH 83/87] Support some cases of blue/green deployment

---
 .../Model/Plugin/ConfigChangeDetector.php     |  12 +-
 .../Model/Plugin/ConfigChangeDetectorTest.php |  25 ++-
 .../Cache/Backend/RemoteSynchronizedCache.php |   3 +-
 .../Module/Plugin/DbStatusValidator.php       |  18 +-
 .../Unit/Plugin/DbStatusValidatorTest.php     |  30 ++-
 .../Module/Plugin/DbStatusValidatorTest.php   | 196 ------------------
 6 files changed, 79 insertions(+), 205 deletions(-)
 delete mode 100644 lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php

diff --git a/app/code/Magento/Deploy/Model/Plugin/ConfigChangeDetector.php b/app/code/Magento/Deploy/Model/Plugin/ConfigChangeDetector.php
index 0642593ac5528..ab865a4e9911b 100644
--- a/app/code/Magento/Deploy/Model/Plugin/ConfigChangeDetector.php
+++ b/app/code/Magento/Deploy/Model/Plugin/ConfigChangeDetector.php
@@ -7,6 +7,7 @@
 namespace Magento\Deploy\Model\Plugin;
 
 use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\FrontControllerInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Exception\LocalizedException;
@@ -20,6 +21,8 @@
  */
 class ConfigChangeDetector
 {
+    private const DEPLOYMENT_BLUE_GREEN_ENABLED = 'deployment/blue_green/enabled';
+
     /**
      * Configuration data changes detector.
      *
@@ -27,12 +30,15 @@ class ConfigChangeDetector
      */
     private $changeDetector;
 
+    private DeploymentConfig $deploymentConfig;
+
     /**
      * @param ChangeDetector $changeDetector configuration data changes detector
      */
-    public function __construct(ChangeDetector $changeDetector)
+    public function __construct(ChangeDetector $changeDetector, DeploymentConfig $deploymentConfig)
     {
         $this->changeDetector = $changeDetector;
+        $this->deploymentConfig = $deploymentConfig;
     }
 
     /**
@@ -46,7 +52,9 @@ public function __construct(ChangeDetector $changeDetector)
      */
     public function beforeDispatch(FrontControllerInterface $subject, RequestInterface $request)
     {
-        if ($this->changeDetector->hasChanges()) {
+        if (!$this->deploymentConfig->get(self::DEPLOYMENT_BLUE_GREEN_ENABLED)
+            && $this->changeDetector->hasChanges()
+        ) {
             throw new LocalizedException(
                 __(
                     'The configuration file has changed.'
diff --git a/app/code/Magento/Deploy/Test/Unit/Model/Plugin/ConfigChangeDetectorTest.php b/app/code/Magento/Deploy/Test/Unit/Model/Plugin/ConfigChangeDetectorTest.php
index 41f17fe633d2f..d3fec0a5ccdca 100644
--- a/app/code/Magento/Deploy/Test/Unit/Model/Plugin/ConfigChangeDetectorTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Model/Plugin/ConfigChangeDetectorTest.php
@@ -9,6 +9,7 @@
 
 use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
 use Magento\Deploy\Model\Plugin\ConfigChangeDetector;
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\FrontControllerInterface;
 use Magento\Framework\App\RequestInterface;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -36,6 +37,11 @@ class ConfigChangeDetectorTest extends TestCase
      */
     private $requestMock;
 
+    /**
+     * @var DeploymentConfig|mixed|MockObject
+     */
+    private $deploymentConfig;
+
     /**
      * @return void
      */
@@ -48,8 +54,14 @@ protected function setUp(): void
             ->getMockForAbstractClass();
         $this->requestMock = $this->getMockBuilder(RequestInterface::class)
             ->getMockForAbstractClass();
+        $this->deploymentConfig =$this->getMockBuilder(DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $this->configChangeDetectorPlugin = new ConfigChangeDetector($this->changeDetectorMock);
+        $this->configChangeDetectorPlugin = new ConfigChangeDetector(
+            $this->changeDetectorMock,
+            $this->deploymentConfig
+        );
     }
 
     /**
@@ -65,8 +77,6 @@ public function testBeforeDispatchWithoutException()
 
     /**
      * @return void
-     * @codingStandardsIgnoreStart
-     * @codingStandardsIgnoreEnd
      */
     public function testBeforeDispatchWithException()
     {
@@ -80,4 +90,13 @@ public function testBeforeDispatchWithException()
             ->willReturn(true);
         $this->configChangeDetectorPlugin->beforeDispatch($this->frontControllerMock, $this->requestMock);
     }
+
+    public function testBeforeDispatchWithBlueGreen()
+    {
+        $this->deploymentConfig->expects($this->atLeastOnce())
+            ->method('get')
+            ->with('deployment/blue_green/enabled')
+            ->willReturn(1);
+        $this->configChangeDetectorPlugin->beforeDispatch($this->frontControllerMock, $this->requestMock);
+    }
 }
diff --git a/lib/internal/Magento/Framework/Cache/Backend/RemoteSynchronizedCache.php b/lib/internal/Magento/Framework/Cache/Backend/RemoteSynchronizedCache.php
index 86c67b68b3936..bd598d2d50548 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/RemoteSynchronizedCache.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/RemoteSynchronizedCache.php
@@ -64,6 +64,7 @@ class RemoteSynchronizedCache extends \Zend_Cache_Backend implements \Zend_Cache
         'local_backend_custom_naming' => true,
         'local_backend_autoload' => true,
         'use_stale_cache' => false,
+        'cleanup_percentage' => 95,
     ];
 
     /**
@@ -264,7 +265,7 @@ public function save($data, $id, $tags = [], $specificLifetime = false)
      */
     private function checkIfLocalCacheSpaceExceeded()
     {
-        return $this->getFillingPercentage() >= 95;
+        return $this->getFillingPercentage() >= ($this->_options['cleanup_percentage'] ?? 95);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
index 96f9674704e17..00921384f5916 100644
--- a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
+++ b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\Module\Plugin;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Cache\FrontendInterface as FrontendCacheInterface;
 use Magento\Framework\Module\DbVersionInfo;
 use Magento\Framework\App\FrontController;
@@ -17,6 +18,8 @@
  */
 class DbStatusValidator
 {
+    private const DEPLOYMENT_BLUE_GREEN_ENABLED = 'deployment/blue_green/enabled';
+
     /**
      * @var FrontendCacheInterface
      */
@@ -27,14 +30,21 @@ class DbStatusValidator
      */
     private $dbVersionInfo;
 
+    private DeploymentConfig $deploymentConfig;
+
     /**
      * @param FrontendCacheInterface $cache
      * @param DbVersionInfo $dbVersionInfo
+     * @param DeploymentConfig $deploymentConfig
      */
-    public function __construct(FrontendCacheInterface $cache, DbVersionInfo $dbVersionInfo)
-    {
+    public function __construct(
+        FrontendCacheInterface $cache,
+        DbVersionInfo $dbVersionInfo,
+        DeploymentConfig $deploymentConfig
+    ) {
         $this->cache = $cache;
         $this->dbVersionInfo = $dbVersionInfo;
+        $this->deploymentConfig = $deploymentConfig;
     }
 
     /**
@@ -49,6 +59,10 @@ public function __construct(FrontendCacheInterface $cache, DbVersionInfo $dbVers
      */
     public function beforeDispatch(FrontController $subject, RequestInterface $request)
     {
+        if ($this->deploymentConfig->get(self::DEPLOYMENT_BLUE_GREEN_ENABLED)) {
+            return;
+        }
+
         if (!$this->cache->load('db_is_up_to_date')) {
             list($versionTooLowErrors, $versionTooHighErrors) = array_values($this->getGroupedDbVersionErrors());
             if ($versionTooHighErrors) {
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/Plugin/DbStatusValidatorTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/Plugin/DbStatusValidatorTest.php
index cd82bc35f25e1..f2ed68101cbdf 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/Plugin/DbStatusValidatorTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/Plugin/DbStatusValidatorTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Framework\Module\Test\Unit\Plugin;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\FrontController;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Cache\FrontendInterface;
@@ -50,6 +51,11 @@ class DbStatusValidatorTest extends TestCase
      */
     private $dbVersionInfoMock;
 
+    /**
+     * @var DeploymentConfig|mixed|MockObject
+     */
+    private $deploymentConfig;
+
     protected function setUp(): void
     {
         $this->_cacheMock = $this->getMockBuilder(FrontendInterface::class)
@@ -67,9 +73,15 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
         $this->dbVersionInfoMock = $this->createMock(DbVersionInfo::class);
+
+        $this->deploymentConfig =$this->getMockBuilder(DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->_model = new DbStatusValidator(
             $this->_cacheMock,
-            $this->dbVersionInfoMock
+            $this->dbVersionInfoMock,
+            $this->deploymentConfig
         );
     }
 
@@ -188,4 +200,20 @@ public function aroundDispatchExceptionDataProvider()
             ],
         ];
     }
+
+    public function testAroundDispatchBlueGreen()
+    {
+        $this->deploymentConfig->expects($this->atLeastOnce())
+            ->method('get')
+            ->with('deployment/blue_green/enabled')
+            ->willReturn(1);
+
+        $this->_cacheMock->expects($this->never())
+            ->method('load');
+
+        $this->dbVersionInfoMock->expects($this->never())
+            ->method('getDbVersionErrors');
+
+        $this->_model->beforeDispatch($this->subjectMock, $this->requestMock);
+    }
 }
diff --git a/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php b/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php
deleted file mode 100644
index 788b62fa0b142..0000000000000
--- a/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Framework\Test\Unit\Module\Plugin;
-
-use Magento\Framework\App\FrontController;
-use Magento\Framework\App\RequestInterface;
-use Magento\Framework\Cache\FrontendInterface as FrontendCacheInterface;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Module\DbVersionInfo;
-use Magento\Framework\Module\Plugin\DbStatusValidator as DbStatusValidatorPlugin;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-
-class DbStatusValidatorTest extends TestCase
-{
-    /**
-     * @var DbStatusValidatorPlugin
-     */
-    private $plugin;
-
-    /**
-     * @var ObjectManagerHelper
-     */
-    private $objectManagerHelper;
-
-    /**
-     * @var FrontendCacheInterface|MockObject
-     */
-    private $cacheMock;
-
-    /**
-     * @var DbVersionInfo|MockObject
-     */
-    private $dbVersionInfoMock;
-
-    /**
-     * @var FrontController|MockObject
-     */
-    private $frontControllerMock;
-
-    /**
-     * @var RequestInterface|MockObject
-     */
-    private $requestMock;
-
-    protected function setUp(): void
-    {
-        $this->cacheMock = $this->getMockBuilder(FrontendCacheInterface::class)
-            ->getMockForAbstractClass();
-        $this->dbVersionInfoMock = $this->getMockBuilder(DbVersionInfo::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->frontControllerMock = $this->getMockBuilder(FrontController::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->requestMock = $this->getMockBuilder(RequestInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-        $this->plugin = $this->objectManagerHelper->getObject(
-            DbStatusValidatorPlugin::class,
-            [
-                'cache' => $this->cacheMock,
-                'dbVersionInfo' => $this->dbVersionInfoMock
-            ]
-        );
-    }
-
-    public function testBeforeDispatchUpToDate()
-    {
-        $this->cacheMock->expects(static::any())
-            ->method('load')
-            ->with('db_is_up_to_date')
-            ->willReturn('cache_data');
-        $this->dbVersionInfoMock->expects(static::never())
-            ->method('getDbVersionErrors');
-        $this->cacheMock->expects(static::never())
-            ->method('save');
-
-        $this->plugin->beforeDispatch($this->frontControllerMock, $this->requestMock);
-    }
-
-    public function testBeforeDispatchOutOfDateNoErrors()
-    {
-        $this->cacheMock->expects(static::any())
-            ->method('load')
-            ->with('db_is_up_to_date')
-            ->willReturn(false);
-        $this->dbVersionInfoMock->expects(static::once())
-            ->method('getDbVersionErrors')
-            ->willReturn([]);
-        $this->cacheMock->expects(static::once())
-            ->method('save')
-            ->with('true', 'db_is_up_to_date', [], null)
-            ->willReturn(true);
-
-        $this->plugin->beforeDispatch($this->frontControllerMock, $this->requestMock);
-    }
-
-    /**
-     * @dataProvider beforeDispatchOutOfDateWithErrorsDataProvider
-     */
-    public function testBeforeDispatchOutOfDateWithErrors(array $errors, string $expectedMessage)
-    {
-        $this->cacheMock->expects(static::any())
-            ->method('load')
-            ->with('db_is_up_to_date')
-            ->willReturn(false);
-        $this->dbVersionInfoMock->expects(static::once())
-            ->method('getDbVersionErrors')
-            ->willReturn($errors);
-        $this->cacheMock->expects(static::never())
-            ->method('save');
-
-        $this->expectException(LocalizedException::class);
-        $this->expectExceptionMessage($expectedMessage);
-        $this->plugin->beforeDispatch($this->frontControllerMock, $this->requestMock);
-    }
-
-    /**
-     * @return array
-     */
-    public static function beforeDispatchOutOfDateWithErrorsDataProvider()
-    {
-        return [
-            'module versions too low' => [
-                'errors' => [
-                    [
-                        DbVersionInfo::KEY_MODULE => 'Magento_Module1',
-                        DbVersionInfo::KEY_TYPE => 'schema',
-                        DbVersionInfo::KEY_CURRENT => 'none',
-                        DbVersionInfo::KEY_REQUIRED => '4.4.4'
-                    ],
-                    [
-                        DbVersionInfo::KEY_MODULE => 'Magento_Module2',
-                        DbVersionInfo::KEY_TYPE => 'data',
-                        DbVersionInfo::KEY_CURRENT => '2.8.7',
-                        DbVersionInfo::KEY_REQUIRED => '5.1.6'
-                    ],
-                ],
-                'expectedMessage' => 'Please upgrade your database: '
-                    . "Run \"bin/magento setup:upgrade\" from the Magento root directory.\n"
-                    . "The following modules are outdated:\n"
-                    . "Magento_Module1 schema: current version - none, required version - 4.4.4\n"
-                    . "Magento_Module2 data: current version - 2.8.7, required version - 5.1.6"
-            ],
-            'module versions too high' => [
-                'errors' => [
-                    [
-                        DbVersionInfo::KEY_MODULE => 'Magento_Module3',
-                        DbVersionInfo::KEY_TYPE => 'schema',
-                        DbVersionInfo::KEY_CURRENT => '2.0.0',
-                        DbVersionInfo::KEY_REQUIRED => '1.0.0'
-                    ],
-                    [
-                        DbVersionInfo::KEY_MODULE => 'Magento_Module4',
-                        DbVersionInfo::KEY_TYPE => 'data',
-                        DbVersionInfo::KEY_CURRENT => '1.0.10',
-                        DbVersionInfo::KEY_REQUIRED => '1.0.9'
-                    ],
-                ],
-                'expectedMessage' => "Please update your modules: "
-                    . "Run \"composer install\" from the Magento root directory.\n"
-                    . "The following modules are outdated:\n"
-                    . "Magento_Module3 schema: code version - 1.0.0, database version - 2.0.0\n"
-                    . "Magento_Module4 data: code version - 1.0.9, database version - 1.0.10",
-            ],
-            'some versions too high, some too low' => [
-                'errors' => [
-                    [
-                        DbVersionInfo::KEY_MODULE => 'Magento_Module2',
-                        DbVersionInfo::KEY_TYPE => 'schema',
-                        DbVersionInfo::KEY_CURRENT => '1.9.0',
-                        DbVersionInfo::KEY_REQUIRED => '1.12.0'
-                    ],
-                    [
-                        DbVersionInfo::KEY_MODULE => 'Magento_Module1',
-                        DbVersionInfo::KEY_TYPE => 'schema',
-                        DbVersionInfo::KEY_CURRENT => '2.0.0',
-                        DbVersionInfo::KEY_REQUIRED => '1.0.0'
-                    ],
-                ],
-                'expectedMessage' => "Please update your modules: "
-                    . "Run \"composer install\" from the Magento root directory.\n"
-                    . "The following modules are outdated:\n"
-                    . "Magento_Module1 schema: code version - 1.0.0, database version - 2.0.0"
-            ]
-        ];
-    }
-}

From 2a00378effc3877429f5dd79d600d17f379f6848 Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Thu, 18 Nov 2021 20:54:43 -0600
Subject: [PATCH 84/87] Fix formatting

---
 .../Magento/Deploy/Model/Plugin/ConfigChangeDetector.php | 6 ++++--
 .../Framework/Cache/Backend/RemoteSynchronizedCache.php  | 9 ++++-----
 .../Framework/Module/Plugin/DbStatusValidator.php        | 5 ++++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Deploy/Model/Plugin/ConfigChangeDetector.php b/app/code/Magento/Deploy/Model/Plugin/ConfigChangeDetector.php
index ab865a4e9911b..700299011a7a7 100644
--- a/app/code/Magento/Deploy/Model/Plugin/ConfigChangeDetector.php
+++ b/app/code/Magento/Deploy/Model/Plugin/ConfigChangeDetector.php
@@ -30,10 +30,12 @@ class ConfigChangeDetector
      */
     private $changeDetector;
 
-    private DeploymentConfig $deploymentConfig;
+    /** @var DeploymentConfig  */
+    private $deploymentConfig;
 
     /**
-     * @param ChangeDetector $changeDetector configuration data changes detector
+     * @param ChangeDetector $changeDetector
+     * @param DeploymentConfig $deploymentConfig
      */
     public function __construct(ChangeDetector $changeDetector, DeploymentConfig $deploymentConfig)
     {
diff --git a/lib/internal/Magento/Framework/Cache/Backend/RemoteSynchronizedCache.php b/lib/internal/Magento/Framework/Cache/Backend/RemoteSynchronizedCache.php
index bd598d2d50548..e2eb0ab8097bc 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/RemoteSynchronizedCache.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/RemoteSynchronizedCache.php
@@ -52,7 +52,9 @@ class RemoteSynchronizedCache extends \Zend_Cache_Backend implements \Zend_Cache
     private const REMOTE_SYNC_LOCK_PREFIX = 'rsl::';
 
     /**
-     * @inheritdoc
+     *  Available options
+     *
+     * @var array available options
      */
     protected $_options = [
         'remote_backend' => '',
@@ -77,7 +79,7 @@ class RemoteSynchronizedCache extends \Zend_Cache_Backend implements \Zend_Cache
     /**
      * Sign for locks, helps to avoid removing a lock that was created by another client
      *
-     * @string
+     * @var string
      */
     private $lockSign;
 
@@ -414,9 +416,6 @@ private function unlock(string $id): bool
 
     /**
      * Calculate lock name.
-     *
-     * @param string $id
-     * @return string
      */
     private function getLockName(string $id): string
     {
diff --git a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
index 00921384f5916..ed0d7a7072099 100644
--- a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
+++ b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
@@ -30,7 +30,10 @@ class DbStatusValidator
      */
     private $dbVersionInfo;
 
-    private DeploymentConfig $deploymentConfig;
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
 
     /**
      * @param FrontendCacheInterface $cache

From 8326e5559095da013a3f8f51952626116e362cb7 Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Fri, 19 Nov 2021 11:30:54 -0600
Subject: [PATCH 85/87] Fix formatting

---
 .../Cache/Backend/RemoteSynchronizedCache.php          | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/internal/Magento/Framework/Cache/Backend/RemoteSynchronizedCache.php b/lib/internal/Magento/Framework/Cache/Backend/RemoteSynchronizedCache.php
index e2eb0ab8097bc..adbee1449a683 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/RemoteSynchronizedCache.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/RemoteSynchronizedCache.php
@@ -34,13 +34,6 @@ class RemoteSynchronizedCache extends \Zend_Cache_Backend implements \Zend_Cache
      */
     private $remote;
 
-    /**
-     * Cache invalidation time
-     *
-     * @var \Zend_Cache_Backend_ExtendedInterface
-     */
-    protected $cacheInvalidationTime;
-
     /**
      * Suffix for hash to compare data version in cache storage.
      */
@@ -416,6 +409,9 @@ private function unlock(string $id): bool
 
     /**
      * Calculate lock name.
+     *
+     * @param string $id
+     * @return string
      */
     private function getLockName(string $id): string
     {

From 7297b0099609caf3da1d471973f62952742d8032 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Fri, 19 Nov 2021 15:44:40 -0600
Subject: [PATCH 86/87] magento-commerce/magento2ce#7218: Fixed tests

---
 .../Wysiwyg/Images/GetThumbnailUrlsTest.php   | 185 ++++++++++++++++++
 .../Cms/Model/Wysiwyg/Images/StorageTest.php  |  63 ------
 2 files changed, 185 insertions(+), 63 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/GetThumbnailUrlsTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/GetThumbnailUrlsTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/GetThumbnailUrlsTest.php
new file mode 100644
index 0000000000000..21afbf805a2a3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/GetThumbnailUrlsTest.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ *
+ */
+namespace Magento\Cms\Model\Wysiwyg\Images;
+
+use Magento\Cms\Model\Wysiwyg\Images\Storage\Collection;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\DataObject;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test methods of class Storage
+ *
+ * @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
+ */
+class GetThumbnailUrlsTest extends \PHPUnit\Framework\TestCase
+{
+    private const MEDIA_GALLERY_IMAGE_FOLDERS_CONFIG_PATH
+        = 'system/media_storage_configuration/allowed_resources/media_gallery_image_folders';
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var Storage
+     */
+    private $storage;
+
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * @var array
+     */
+    private $origConfigValue;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\WriteInterface
+     */
+    private $mediaDirectory;
+
+    /**
+     * @var string
+     */
+    private $fullDirectoryPath;
+
+    /**
+     * @var \Magento\Cms\Helper\Wysiwyg\Images
+     */
+    private $imagesHelper;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->filesystem = $this->objectManager->get(Filesystem::class);
+        $this->imagesHelper = $this->objectManager->get(\Magento\Cms\Helper\Wysiwyg\Images::class);
+        $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $this->fullDirectoryPath = rtrim($this->imagesHelper->getStorageRoot(), '/')
+            . '/MagentoCmsModelWysiwygImagesStorageTest';
+        $this->mediaDirectory->create($this->mediaDirectory->getRelativePath($this->fullDirectoryPath));
+        $config = $this->objectManager->get(ScopeConfigInterface::class);
+        $this->origConfigValue = $config->getValue(
+            self::MEDIA_GALLERY_IMAGE_FOLDERS_CONFIG_PATH,
+            'default'
+        );
+        $scopeConfig = $this->objectManager->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class);
+        $scopeConfig->setValue(
+            self::MEDIA_GALLERY_IMAGE_FOLDERS_CONFIG_PATH,
+            array_merge($this->origConfigValue, ['MagentoCmsModelWysiwygImagesStorageTest']),
+        );
+        $this->storage = $this->objectManager->create(Storage::class);
+        $this->driver = $this->mediaDirectory->getDriver();
+    }
+
+    protected function tearDown(): void
+    {
+        $this->mediaDirectory->delete($this->mediaDirectory->getRelativePath($this->fullDirectoryPath));
+        $scopeConfig = $this->objectManager->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class);
+        $scopeConfig->setValue(
+            self::MEDIA_GALLERY_IMAGE_FOLDERS_CONFIG_PATH,
+            $this->origConfigValue
+        );
+    }
+
+    /**
+     * Test that getThumbnailUrl() returns correct URL for root folder or sub-folders images
+     *
+     * @param string $directory
+     * @param string $filename
+     * @param array $expectedUrls
+     * @return void
+     * @magentoAppIsolation enabled
+     * @magentoAppArea adminhtml
+     * @dataProvider getThumbnailUrlDataProvider
+     */
+    public function testGetThumbnailUrl(string $directory, string $filename, array $expectedUrls): void
+    {
+        $root = $this->storage->getCmsWysiwygImages()->getStorageRoot();
+        $directory = implode('/', array_filter([rtrim($root, '/'), trim($directory, '/')]));
+        $path = $directory . '/' . $filename;
+        $this->generateImage($path);
+        $this->storage->resizeFile($path);
+        $collection = $this->storage->getFilesCollection($directory, 'image');
+        $paths = [];
+        foreach ($collection as $item) {
+            $paths[] = parse_url($item->getThumbUrl(), PHP_URL_PATH);
+        }
+        $this->assertEquals($expectedUrls, $paths);
+        $this->driver->deleteFile($path);
+    }
+
+    /**
+     * Provide scenarios for testing getThumbnailUrl()
+     *
+     * @return array
+     */
+    public function getThumbnailUrlDataProvider(): array
+    {
+        return [
+            [
+                '/',
+                'image1.png',
+                []
+            ],
+            [
+                '/cms',
+                'image2.png',
+                []
+            ],
+            [
+                '/cms/pages',
+                'image3.png',
+                []
+            ],
+            [
+                '/MagentoCmsModelWysiwygImagesStorageTest',
+                'image2.png',
+                ['/media/.thumbsMagentoCmsModelWysiwygImagesStorageTest/image2.png']
+            ],
+            [
+                '/MagentoCmsModelWysiwygImagesStorageTest/pages',
+                'image3.png',
+                ['/media/.thumbsMagentoCmsModelWysiwygImagesStorageTest/pages/image3.png']
+            ]
+        ];
+    }
+
+    /**
+     * Generate a dummy image of the given width and height.
+     *
+     * @param string $path
+     * @return string
+     */
+    private function generateImage(string $path)
+    {
+        $this->mediaDirectory->create(dirname($this->mediaDirectory->getRelativePath($path)));
+        ob_start();
+        $image = imagecreatetruecolor(1024, 768);
+        imagepng($image);
+        $this->driver->filePutContents($path, ob_get_clean());
+        return $path;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
index 658b38be99752..3d9826a291097 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
@@ -312,33 +312,6 @@ public function testUploadFileWithWrongFile(): void
         // phpcs:enable
     }
 
-    /**
-     * Test that getThumbnailUrl() returns correct URL for root folder or sub-folders images
-     *
-     * @param string $directory
-     * @param string $filename
-     * @param array $expectedUrls
-     * @return void
-     * @magentoAppIsolation enabled
-     * @magentoAppArea adminhtml
-     * @dataProvider getThumbnailUrlDataProvider
-     */
-    public function testGetThumbnailUrl(string $directory, string $filename, array $expectedUrls): void
-    {
-        $root = $this->storage->getCmsWysiwygImages()->getStorageRoot();
-        $directory = implode('/', array_filter([rtrim($root, '/'), trim($directory, '/')]));
-        $path = $directory . '/' . $filename;
-        $this->generateImage($path);
-        $this->storage->resizeFile($path);
-        $collection = $this->storage->getFilesCollection($directory, 'image');
-        $paths = [];
-        foreach ($collection as $item) {
-            $paths[] = parse_url($item->getThumbUrl(), PHP_URL_PATH);
-        }
-        $this->assertEquals($expectedUrls, $paths);
-        $this->driver->deleteFile($path);
-    }
-
     /**
      * Verify thumbnail generation for diferent sizes
      *
@@ -391,42 +364,6 @@ public function getThumbnailsSizes(): array
         ];
     }
 
-    /**
-     * Provide scenarios for testing getThumbnailUrl()
-     *
-     * @return array
-     */
-    public function getThumbnailUrlDataProvider(): array
-    {
-        return [
-            [
-                '/',
-                'image1.png',
-                []
-            ],
-            [
-                '/cms',
-                'image2.png',
-                []
-            ],
-            [
-                '/cms/pages',
-                'image3.png',
-                []
-            ],
-            [
-                '/MagentoCmsModelWysiwygImagesStorageTest',
-                'image2.png',
-                ['/media/.thumbsMagentoCmsModelWysiwygImagesStorageTest/image2.png']
-            ],
-            [
-                '/MagentoCmsModelWysiwygImagesStorageTest/pages',
-                'image3.png',
-                ['/media/.thumbsMagentoCmsModelWysiwygImagesStorageTest/pages/image3.png']
-            ]
-        ];
-    }
-
     /**
      * Generate a dummy image of the given width and height.
      *

From 6f62ee908b236983ded9abd9bf32c5f2077021fb Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Fri, 19 Nov 2021 17:19:43 -0600
Subject: [PATCH 87/87] MCP-797: Getting error while running performance tool

---
 setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php
index 583bab49986ca..78a8a738d05a1 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php
@@ -62,7 +62,7 @@ private function findMissingFactories($file, $classReflection, $methodName, $ent
         $parameters = $constructor->getParameters();
         /** @var $parameter \ReflectionParameter */
         foreach ($parameters as $parameter) {
-            preg_match('/\[\s\<\w+?>\s([\w\\\\]+)/s', $parameter->__toString(), $matches);
+            preg_match('/\[\s\<\w+?>\s\??([\w\\\\]+)/s', $parameter->__toString(), $matches);
             if (isset($matches[1]) && substr($matches[1], -strlen($entityType)) == $entityType) {
                 $missingClassName = $matches[1];
                 if ($this->shouldGenerateClass($missingClassName, $entityType, $file)) {