Skip to content

Commit fb28308

Browse files
NadiyaSshiftedreality
NadiyaS
authored and
shiftedreality
committed
MAGECLOUD-2850: DI compilation issue with Amazon_Payment module (Reopened) (#374)
1 parent 16425b2 commit fb28308

File tree

1 file changed

+91
-62
lines changed

1 file changed

+91
-62
lines changed

‎patches/MAGECLOUD-2850_fix_amazon_payment_module__2.2.6.patch

Lines changed: 91 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,69 @@
11
diff -Nuar a/vendor/amzn/amazon-pay-module/etc/di.xml b/vendor/amzn/amazon-pay-module/etc/di.xml
2-
index c954f48e..09626be3 100644
2+
index c954f48..e585eae 100644
33
--- a/vendor/amzn/amazon-pay-module/etc/di.xml
44
+++ b/vendor/amzn/amazon-pay-module/etc/di.xml
5-
@@ -55,8 +55,8 @@
6-
<virtualType name="Amazon\Payment\Gateway\ErrorMapper\VirtualErrorMessageMapper"
7-
type="Magento\Payment\Gateway\ErrorMapper\ErrorMessageMapper">
5+
@@ -39,24 +39,20 @@
6+
7+
<!-- Amazon error code mapper -->
8+
9+
- <virtualType name="Amazon\Payment\Gateway\ErrorMapper\VirtualConfigReader"
10+
- type="Magento\Payment\Gateway\ErrorMapper\VirtualConfigReader">
11+
+ <virtualType name="Amazon\Payment\Gateway\ErrorMapper\VirtualConfigReader" type="Magento\Payment\Gateway\ErrorMapper\VirtualConfigReader">
12+
<arguments>
13+
<argument name="fileName" xsi:type="string">amazon_error_mapping.xml</argument>
14+
</arguments>
15+
</virtualType>
16+
- <virtualType name="Amazon\Payment\Gateway\ErrorMapper\VirtualMappingData"
17+
- type="Magento\Payment\Gateway\ErrorMapper\MappingData">
18+
+ <virtualType name="Amazon\Payment\Gateway\ErrorMapper\VirtualMappingData" type="Magento\Payment\Gateway\ErrorMapper\MappingData">
19+
<arguments>
20+
<argument name="reader" xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualConfigReader</argument>
21+
<argument name="cacheId" xsi:type="string">amazon_error_mapper</argument>
22+
</arguments>
23+
</virtualType>
24+
- <virtualType name="Amazon\Payment\Gateway\ErrorMapper\VirtualErrorMessageMapper"
25+
- type="Magento\Payment\Gateway\ErrorMapper\ErrorMessageMapper">
26+
+ <virtualType name="Amazon\Payment\Gateway\ErrorMapper\VirtualErrorMessageMapper" type="Magento\Payment\Gateway\ErrorMapper\ErrorMessageMapper">
827
<arguments>
928
- <argument name="messageMapping" xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualMappingData
1029
- </argument>
11-
+ <argument name="messageMapping"
12-
+ xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualMappingData</argument>
30+
+ <argument name="messageMapping" xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualMappingData</argument>
1331
</arguments>
1432
</virtualType>
1533

16-
@@ -120,19 +120,18 @@
34+
@@ -120,15 +116,12 @@
1735
<!-- Authorize command -->
1836
<virtualType name="AmazonAuthorizeCommand" type="Amazon\Payment\Gateway\Command\AmazonAuthCommand">
1937
<arguments>
2038
- <argument name="requestBuilder" xsi:type="object">Amazon\Payment\Gateway\Request\AuthorizationRequest
2139
- </argument>
22-
+ <argument name="requestBuilder"
23-
+ xsi:type="object">Amazon\Payment\Gateway\Request\AuthorizationRequestBuilder</argument>
40+
+ <argument name="requestBuilder" xsi:type="object">Amazon\Payment\Gateway\Request\AuthorizationRequest</argument>
2441
<argument name="handler" xsi:type="object">Amazon\Payment\Gateway\Response\CompleteAuthHandler</argument>
2542
<argument name="transferFactory" xsi:type="object">Amazon\Payment\Gateway\Http\TransferFactory</argument>
2643
<argument name="validator" xsi:type="object">AmazonAuthorizationValidators</argument>
2744
<argument name="client" xsi:type="object">Amazon\Payment\Gateway\Http\Client\AuthorizeClient</argument>
28-
<argument name="errorMessageMapper"
45+
- <argument name="errorMessageMapper"
2946
- xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualErrorMessageMapper
3047
- </argument>
31-
+ xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualErrorMessageMapper</argument>
48+
+ <argument name="errorMessageMapper" xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualErrorMessageMapper</argument>
3249
</arguments>
3350
</virtualType>
3451

35-
- <type name="Amazon\Payment\Gateway\Request\AuthorizationRequest">
36-
+ <type name="Amazon\Payment\Gateway\Request\AuthorizationRequestBuilder">
37-
<arguments>
38-
<argument name="config" xsi:type="object">AmazonGatewayConfig</argument>
39-
</arguments>
40-
@@ -141,35 +140,33 @@
52+
@@ -141,30 +134,24 @@
4153
<!-- Authorize and Capture command -->
4254
<virtualType name="AmazonSaleCommand" type="Amazon\Payment\Gateway\Command\AmazonAuthCommand">
4355
<arguments>
4456
- <argument name="requestBuilder" xsi:type="object">Amazon\Payment\Gateway\Request\AuthorizationRequest
4557
- </argument>
46-
+ <argument name="requestBuilder"
47-
+ xsi:type="object">Amazon\Payment\Gateway\Request\AuthorizationRequestBuilder</argument>
58+
+ <argument name="requestBuilder" xsi:type="object">Amazon\Payment\Gateway\Request\AuthorizationRequest</argument>
4859
<argument name="handler" xsi:type="object">Amazon\Payment\Gateway\Response\CompleteSaleHandler</argument>
4960
<argument name="transferFactory" xsi:type="object">Amazon\Payment\Gateway\Http\TransferFactory</argument>
5061
<argument name="validator" xsi:type="object">AmazonAuthorizationValidators</argument>
5162
<argument name="client" xsi:type="object">Amazon\Payment\Gateway\Http\Client\CaptureClient</argument>
52-
<argument name="errorMessageMapper"
63+
- <argument name="errorMessageMapper"
5364
- xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualErrorMessageMapper
5465
- </argument>
55-
+ xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualErrorMessageMapper</argument>
66+
+ <argument name="errorMessageMapper" xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualErrorMessageMapper</argument>
5667
</arguments>
5768
</virtualType>
5869

@@ -61,88 +72,106 @@ index c954f48e..09626be3 100644
6172
<arguments>
6273
- <argument name="requestBuilder" xsi:type="object">Amazon\Payment\Gateway\Request\SettlementRequest
6374
- </argument>
64-
+ <argument name="requestBuilder"
65-
+ xsi:type="object">Amazon\Payment\Gateway\Request\SettlementRequestBuilder</argument>
75+
+ <argument name="requestBuilder" xsi:type="object">Amazon\Payment\Gateway\Request\SettlementRequest</argument>
6676
<argument name="handler" xsi:type="object">Amazon\Payment\Gateway\Response\SettlementHandler</argument>
6777
<argument name="transferFactory" xsi:type="object">Amazon\Payment\Gateway\Http\TransferFactory</argument>
6878
<argument name="validator" xsi:type="object">AmazonAuthorizationValidators</argument>
6979
<argument name="client" xsi:type="object">Amazon\Payment\Gateway\Http\Client\SettlementClient</argument>
70-
<argument name="errorMessageMapper"
80+
- <argument name="errorMessageMapper"
7181
- xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualErrorMessageMapper
7282
- </argument>
73-
+ xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualErrorMessageMapper</argument>
83+
+ <argument name="errorMessageMapper" xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualErrorMessageMapper</argument>
7484
</arguments>
7585
</virtualType>
7686

77-
<!-- Capture Request -->
78-
- <type name="Amazon\Payment\Gateway\Request\CaptureRequest">
79-
+ <type name="Amazon\Payment\Gateway\Request\CaptureRequestBuilder">
80-
<arguments>
81-
<argument name="config" xsi:type="object">AmazonGatewayConfig</argument>
82-
<argument name="coreHelper" xsi:type="object">Amazon\Core\Helper\Data</argument>
83-
@@ -180,35 +177,33 @@
84-
<!-- Refund Command -->
85-
<virtualType name="AmazonRefundCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
86-
<arguments>
87-
- <argument name="requestBuilder" xsi:type="object">Amazon\Payment\Gateway\Request\RefundRequest</argument>
88-
+ <argument name="requestBuilder" xsi:type="object">Amazon\Payment\Gateway\Request\RefundRequestBuilder</argument>
87+
@@ -183,12 +170,9 @@
88+
<argument name="requestBuilder" xsi:type="object">Amazon\Payment\Gateway\Request\RefundRequest</argument>
8989
<argument name="handler" xsi:type="object">Amazon\Payment\Gateway\Response\RefundHandler</argument>
9090
<argument name="transferFactory" xsi:type="object">Amazon\Payment\Gateway\Http\TransferFactory</argument>
9191
- <argument name="validator" xsi:type="object">Amazon\Payment\Gateway\Validator\AuthorizationValidator
9292
- </argument>
93-
+ <argument name="validator"
94-
+ xsi:type="object">Amazon\Payment\Gateway\Validator\AuthorizationValidator</argument>
93+
+ <argument name="validator" xsi:type="object">Amazon\Payment\Gateway\Validator\AuthorizationValidator</argument>
9594
<argument name="client" xsi:type="object">Amazon\Payment\Gateway\Http\Client\RefundClient</argument>
96-
<argument name="errorMessageMapper"
95+
- <argument name="errorMessageMapper"
9796
- xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualErrorMessageMapper
9897
- </argument>
99-
+ xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualErrorMessageMapper</argument>
98+
+ <argument name="errorMessageMapper" xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualErrorMessageMapper</argument>
10099
</arguments>
101100
</virtualType>
102101

103-
<!-- Void command -->
104-
<virtualType name="AmazonVoidCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
105-
<arguments>
106-
- <argument name="requestBuilder" xsi:type="object">Amazon\Payment\Gateway\Request\VoidRequest</argument>
107-
+ <argument name="requestBuilder" xsi:type="object">Amazon\Payment\Gateway\Request\VoidRequestBuilder</argument>
102+
@@ -198,12 +182,9 @@
103+
<argument name="requestBuilder" xsi:type="object">Amazon\Payment\Gateway\Request\VoidRequest</argument>
108104
<argument name="handler" xsi:type="object">Amazon\Payment\Gateway\Response\VoidHandler</argument>
109105
<argument name="transferFactory" xsi:type="object">Amazon\Payment\Gateway\Http\TransferFactory</argument>
110106
- <argument name="validator" xsi:type="object">Amazon\Payment\Gateway\Validator\AuthorizationValidator
111107
- </argument>
112-
+ <argument name="validator"
113-
+ xsi:type="object">Amazon\Payment\Gateway\Validator\AuthorizationValidator</argument>
108+
+ <argument name="validator" xsi:type="object">Amazon\Payment\Gateway\Validator\AuthorizationValidator</argument>
114109
<argument name="client" xsi:type="object">Amazon\Payment\Gateway\Http\Client\VoidClient</argument>
115-
<argument name="errorMessageMapper"
110+
- <argument name="errorMessageMapper"
116111
- xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualErrorMessageMapper
117112
- </argument>
118-
+ xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualErrorMessageMapper</argument>
113+
+ <argument name="errorMessageMapper" xsi:type="object">Amazon\Payment\Gateway\ErrorMapper\VirtualErrorMessageMapper</argument>
119114
</arguments>
120115
</virtualType>
121116

122-
<!-- Void Request -->
123-
- <type name="Amazon\Payment\Gateway\Request\VoidRequest">
124-
+ <type name="Amazon\Payment\Gateway\Request\VoidRequestBuilder">
125-
<arguments>
126-
<argument name="config" xsi:type="object">AmazonGatewayConfig</argument>
127-
</arguments>
128-
@@ -280,8 +275,8 @@
117+
@@ -237,26 +218,22 @@
118+
119+
<!-- end gateway config -->
120+
121+
- <preference for="Amazon\Payment\Api\OrderInformationManagementInterface"
122+
- type="Amazon\Payment\Model\OrderInformationManagement"/>
123+
+ <preference for="Amazon\Payment\Api\OrderInformationManagementInterface" type="Amazon\Payment\Model\OrderInformationManagement"/>
124+
<preference for="Amazon\Payment\Api\AddressManagementInterface" type="Amazon\Payment\Model\AddressManagement"/>
125+
<preference for="Amazon\Payment\Api\QuoteLinkManagementInterface" type="Amazon\Payment\Model\QuoteLinkManagement"/>
126+
<preference for="Amazon\Payment\Api\Data\QuoteLinkInterface" type="Amazon\Payment\Model\QuoteLink"/>
127+
<preference for="Amazon\Payment\Api\Data\OrderLinkInterface" type="Amazon\Payment\Model\OrderLink"/>
128+
<preference for="Amazon\Payment\Api\Data\PendingCaptureInterface" type="Amazon\Payment\Model\PendingCapture"/>
129+
- <preference for="Amazon\Payment\Api\Data\PendingAuthorizationInterface"
130+
- type="Amazon\Payment\Model\PendingAuthorization"/>
131+
+ <preference for="Amazon\Payment\Api\Data\PendingAuthorizationInterface" type="Amazon\Payment\Model\PendingAuthorization"/>
132+
<preference for="Amazon\Payment\Api\Data\PendingRefundInterface" type="Amazon\Payment\Model\PendingRefund"/>
133+
<preference for="Amazon\Payment\Ipn\IpnHandlerFactoryInterface" type="Amazon\Payment\Ipn\IpnHandlerFactory"/>
134+
<preference for="AmazonPay\IpnHandlerInterface" type="Amazon\Payment\Ipn\IpnHandler"/>
135+
- <preference for="Amazon\Payment\Api\Ipn\CompositeProcessorInterface"
136+
- type="Amazon\Payment\Model\Ipn\CompositeProcessor"/>
137+
+ <preference for="Amazon\Payment\Api\Ipn\CompositeProcessorInterface" type="Amazon\Payment\Model\Ipn\CompositeProcessor"/>
138+
<type name="Magento\Quote\Api\CartRepositoryInterface">
139+
<plugin name="amazon_payment_quote_repository" type="Amazon\Payment\Plugin\QuoteRepository" sortOrder="1"/>
140+
</type>
141+
<type name="Magento\Checkout\Api\ShippingInformationManagementInterface">
142+
- <plugin name="amazon_payment_shipping_information_management"
143+
- type="Amazon\Payment\Plugin\ShippingInformationManagement" sortOrder="1"/>
144+
+ <plugin name="amazon_payment_shipping_information_management" type="Amazon\Payment\Plugin\ShippingInformationManagement" sortOrder="1"/>
145+
</type>
146+
<type name="Magento\Quote\Api\Data\PaymentInterface">
147+
<plugin name="amazon_payment_additional_information" type="Amazon\Payment\Plugin\AdditionalInformation"/>
148+
@@ -280,17 +257,14 @@
129149
</type>
130150
<type name="Amazon\Payment\Model\QueuedRefundUpdater">
131151
<arguments>
132152
- <argument name="adminNotifier" xsi:type="object">Magento\Framework\Notification\NotifierInterface\Proxy
133153
- </argument>
134-
+ <argument name="adminNotifier"
135-
+ xsi:type="object">Magento\Framework\Notification\NotifierInterface\Proxy</argument>
154+
+ <argument name="adminNotifier" xsi:type="object">Magento\Framework\Notification\NotifierInterface\Proxy</argument>
136155
</arguments>
137156
</type>
138157
<type name="Amazon\Payment\Api\Ipn\CompositeProcessorInterface">
139-
@@ -289,8 +284,7 @@
158+
<arguments>
140159
<argument name="processors" xsi:type="array">
141160
<item name="captureprocessor" xsi:type="object">Amazon\Payment\Model\Ipn\CaptureProcessor\Proxy</item>
142-
<item name="authorizationprocessor"
161+
- <item name="authorizationprocessor"
143162
- xsi:type="object">Amazon\Payment\Model\Ipn\AuthorizationProcessor\Proxy
144163
- </item>
145-
+ xsi:type="object">Amazon\Payment\Model\Ipn\AuthorizationProcessor\Proxy</item>
164+
+ <item name="authorizationprocessor" xsi:type="object">Amazon\Payment\Model\Ipn\AuthorizationProcessor\Proxy</item>
146165
<item name="orderprocessor" xsi:type="object">Amazon\Payment\Model\Ipn\OrderProcessor\Proxy</item>
147166
<item name="refundprocessor" xsi:type="object">Amazon\Payment\Model\Ipn\RefundProcessor\Proxy</item>
148167
</argument>
168+
@@ -310,8 +284,7 @@
169+
</arguments>
170+
</type>
171+
<type name="Magento\Framework\Webapi\ErrorProcessor">
172+
- <plugin name="amazon_payment_webapi_error_processor" type="Amazon\Payment\Plugin\WebapiErrorProcessor"
173+
- sortOrder="1"/>
174+
+ <plugin name="amazon_payment_webapi_error_processor" type="Amazon\Payment\Plugin\WebapiErrorProcessor" sortOrder="1"/>
175+
</type>
176+
177+
<type name="Amazon\Payment\Gateway\Config\Config">

0 commit comments

Comments
 (0)