From e90cd93143810c4265b6e2266cfc7ffa6020e789 Mon Sep 17 00:00:00 2001
From: Jay Becker <jay@beargroup.com>
Date: Fri, 23 Jul 2021 11:23:29 -0500
Subject: [PATCH 1/2] Proxy console commands to correct marketplace submission
 failure

---
 Command/Async/ProcessCommand.php                |  8 ++++++++
 Command/Sales/AmazonChargePermissionCommand.php |  9 +++++++++
 etc/di.xml                                      | 16 ++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/Command/Async/ProcessCommand.php b/Command/Async/ProcessCommand.php
index 284a1ece1..49229f217 100644
--- a/Command/Async/ProcessCommand.php
+++ b/Command/Async/ProcessCommand.php
@@ -20,6 +20,14 @@ class ProcessCommand extends Command
      */
     private $asyncUpdater;
 
+    /**
+     * ProcessCommand constructor.
+     *
+     * These dependencies are proxied, update di.xml if changed
+     * @param \Amazon\Pay\Model\ResourceModel\Async\CollectionFactory $asyncCollectionFactory
+     * @param \Amazon\Pay\Model\AsyncUpdater $asyncUpdater
+     * @param string|null $name
+     */
     public function __construct(
         \Amazon\Pay\Model\ResourceModel\Async\CollectionFactory $asyncCollectionFactory,
         \Amazon\Pay\Model\AsyncUpdater $asyncUpdater,
diff --git a/Command/Sales/AmazonChargePermissionCommand.php b/Command/Sales/AmazonChargePermissionCommand.php
index 388ade804..210aa2963 100644
--- a/Command/Sales/AmazonChargePermissionCommand.php
+++ b/Command/Sales/AmazonChargePermissionCommand.php
@@ -47,6 +47,15 @@ class AmazonChargePermissionCommand extends Command
      */
     private $searchCriteriaBuilder;
 
+    /**
+     * AmazonChargePermissionCommand constructor.
+     *
+     * These dependencies are proxied, update di.xml if changed
+     * @param \Magento\Framework\App\State $state
+     * @param \Magento\Sales\Model\OrderRepository $orderRepository
+     * @param \Amazon\Pay\Model\Adapter\AmazonPayAdapter $amazonAdapter
+     * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
+     */
     public function __construct(
         \Magento\Framework\App\State $state,
         \Magento\Sales\Model\OrderRepository $orderRepository,
diff --git a/etc/di.xml b/etc/di.xml
index 155291877..e62bbf457 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -49,6 +49,13 @@
         </arguments>
     </type>
 
+    <type name="Amazon\Pay\Command\Async\ProcessCommand">
+        <arguments>
+            <argument name="asyncCollectionFactory" xsi:type="object">Amazon\Pay\Model\ResourceModel\Async\CollectionFactory\Proxy</argument>
+            <argument name="asyncUpdater" xsi:type="object">Amazon\Pay\Model\AsyncUpdater\Proxy</argument>
+        </arguments>
+    </type>
+
     <type name="Magento\Framework\Console\CommandList">
        <arguments>
            <argument name="commands" xsi:type="array">
@@ -57,6 +64,15 @@
        </arguments>
    </type>
 
+    <type name="Amazon\Pay\Command\Sales\AmazonChargePermissionCommand">
+        <arguments>
+            <argument name="state" xsi:type="object">Magento\Framework\App\State\Proxy</argument>
+            <argument name="orderRepository" xsi:type="object">Magento\Sales\Model\OrderRepository\Proxy</argument>
+            <argument name="amazonAdapter" xsi:type="object">Amazon\Pay\Model\Adapter\AmazonPayAdapter\Proxy</argument>
+            <argument name="searchCriteriaBuilder" xsi:type="object">Magento\Framework\Api\SearchCriteriaBuilder\Proxy</argument>
+        </arguments>
+    </type>
+
    <type name="Magento\Framework\Console\CommandList">
         <arguments>
             <argument name="commands" xsi:type="array">

From 4227a4e7601ef7debaa242e067ec93ce8b68a543 Mon Sep 17 00:00:00 2001
From: Jay Becker <jay@beargroup.com>
Date: Fri, 23 Jul 2021 11:24:44 -0500
Subject: [PATCH 2/2] Fix spacing in di.xml

---
 etc/di.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/etc/di.xml b/etc/di.xml
index e62bbf457..ef2313504 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -57,12 +57,12 @@
     </type>
 
     <type name="Magento\Framework\Console\CommandList">
-       <arguments>
-           <argument name="commands" xsi:type="array">
-               <item name="AmazonPayAsyncProcess" xsi:type="object">Amazon\Pay\Command\Async\ProcessCommand</item>
-           </argument>
-       </arguments>
-   </type>
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="AmazonPayAsyncProcess" xsi:type="object">Amazon\Pay\Command\Async\ProcessCommand</item>
+            </argument>
+        </arguments>
+    </type>
 
     <type name="Amazon\Pay\Command\Sales\AmazonChargePermissionCommand">
         <arguments>
@@ -73,7 +73,7 @@
         </arguments>
     </type>
 
-   <type name="Magento\Framework\Console\CommandList">
+    <type name="Magento\Framework\Console\CommandList">
         <arguments>
             <argument name="commands" xsi:type="array">
                 <item name="AmazonChargePermissionCommand" xsi:type="object">Amazon\Pay\Command\Sales\AmazonChargePermissionCommand</item>