Merge pull request #119 from OnTap/task--AMAZON-45

AMAZON-45: Upgrade dep. module amazon-pay-sdk-php from 2.1 to 3.1
amzn · Aug 29, 2017 · a756d4d · a756d4d
2 parents 95ec2f8 + 3d35c09
commit a756d4d
Show file tree

Hide file tree

Showing 21 changed files with 23 additions and 23 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     "magento/module-quote": "^100.1.0",
     "magento/module-customer": "^100.1.0",
     "magento/module-store": "^100.1.0",
-    "amzn/login-and-pay-with-amazon-sdk-php": "^2.1.0"
+    "amzn/amazon-pay-sdk-php": "^3.1.0"
   },
   "require-dev": {
     "guzzlehttp/guzzle": "^6.2.0",

diff --git a/marketplace-composer.json b/marketplace-composer.json
@@ -8,7 +8,7 @@
   ],
   "require": {
     "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
-    "amzn/login-and-pay-with-amazon-sdk-php": "^2.1.0",
+    "amzn/amazon-pay-sdk-php": "^3.1.0",
     "amzn/amazon-pay-and-login-with-amazon-core-module": "^1.1.1",
     "amzn/login-with-amazon-module": "^1.1.1",
     "amzn/amazon-pay-module": "^1.1.1"

diff --git a/src/Core/Client/Client.php b/src/Core/Client/Client.php
@@ -15,7 +15,7 @@
  */
 namespace Amazon\Core\Client;
 
-use PayWithAmazon\Client as AmazonClient;
+use AmazonPay\Client as AmazonClient;
 
 class Client extends AmazonClient
 {

diff --git a/src/Core/Client/ClientFactory.php b/src/Core/Client/ClientFactory.php
@@ -55,7 +55,7 @@ public function __construct(
         ObjectManagerInterface $objectManager,
         Data $coreHelper,
         LoggerInterface $logger,
-        $instanceName = '\\PayWithAmazon\\ClientInterface'
+        $instanceName = '\\AmazonPay\\ClientInterface'
     ) {
         $this->objectManager = $objectManager;
         $this->coreHelper    = $coreHelper;

diff --git a/src/Core/Client/ClientFactoryInterface.php b/src/Core/Client/ClientFactoryInterface.php
@@ -16,7 +16,7 @@
 namespace Amazon\Core\Client;
 
 use Magento\Store\Model\ScopeInterface;
-use PayWithAmazon\ClientInterface;
+use AmazonPay\ClientInterface;
 
 interface ClientFactoryInterface
 {

diff --git a/src/Core/Model/Validation/ApiCredentialsValidator.php b/src/Core/Model/Validation/ApiCredentialsValidator.php
@@ -19,7 +19,7 @@
 use Amazon\Core\Helper\Data;
 use Magento\Framework\DataObject;
 use Magento\Framework\Validator\AbstractValidator;
-use PayWithAmazon\ResponseInterface;
+use AmazonPay\ResponseInterface;
 
 class ApiCredentialsValidator extends AbstractValidator
 {

diff --git a/src/Core/composer.json b/src/Core/composer.json
@@ -12,7 +12,7 @@
     "magento/module-store": "^100.1.0",
     "magento/module-developer": "^100.1.0",
     "magento/module-quote": "^100.1.0",
-    "amzn/login-and-pay-with-amazon-sdk-php": "^2.1.0"
+    "amzn/amazon-pay-sdk-php": "^3.1.0"
   },
   "autoload": {
     "files": ["registration.php"],

diff --git a/src/Core/etc/di.xml b/src/Core/etc/di.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Amazon\Core\Client\ClientFactoryInterface" type="Amazon\Core\Client\ClientFactory" />
-    <preference for="PayWithAmazon\ClientInterface" type="Amazon\Core\Client\Client" />
-    <type name="PayWithAmazon\ClientInterface">
+    <preference for="AmazonPay\ClientInterface" type="Amazon\Core\Client\Client" />
+    <type name="AmazonPay\ClientInterface">
         <arguments>
             <argument name="config" xsi:type="array" />
         </arguments>

diff --git a/src/Payment/Domain/AbstractAmazonAuthorizationResponse.php b/src/Payment/Domain/AbstractAmazonAuthorizationResponse.php
@@ -18,7 +18,7 @@
 use Amazon\Core\Exception\AmazonServiceUnavailableException;
 use Amazon\Payment\Domain\Details\AmazonAuthorizationDetails;
 use Amazon\Payment\Domain\Details\AmazonAuthorizationDetailsFactory;
-use PayWithAmazon\ResponseInterface;
+use AmazonPay\ResponseInterface;
 
 abstract class AbstractAmazonAuthorizationResponse
 {

diff --git a/src/Payment/Domain/AbstractAmazonCaptureResponse.php b/src/Payment/Domain/AbstractAmazonCaptureResponse.php
@@ -18,7 +18,7 @@
 use Amazon\Core\Exception\AmazonServiceUnavailableException;
 use Amazon\Payment\Domain\Details\AmazonCaptureDetails;
 use Amazon\Payment\Domain\Details\AmazonCaptureDetailsFactory;
-use PayWithAmazon\ResponseInterface;
+use AmazonPay\ResponseInterface;
 
 abstract class AbstractAmazonCaptureResponse
 {

diff --git a/src/Payment/Domain/AbstractAmazonRefundResponse.php b/src/Payment/Domain/AbstractAmazonRefundResponse.php
@@ -18,7 +18,7 @@
 use Amazon\Core\Exception\AmazonServiceUnavailableException;
 use Amazon\Payment\Domain\Details\AmazonRefundDetails;
 use Amazon\Payment\Domain\Details\AmazonRefundDetailsFactory;
-use PayWithAmazon\ResponseInterface;
+use AmazonPay\ResponseInterface;
 
 abstract class AbstractAmazonRefundResponse
 {

diff --git a/src/Payment/Domain/AmazonGetOrderDetailsResponse.php b/src/Payment/Domain/AmazonGetOrderDetailsResponse.php
@@ -18,7 +18,7 @@
 use Amazon\Core\Exception\AmazonServiceUnavailableException;
 use Amazon\Payment\Domain\Details\AmazonOrderDetails;
 use Amazon\Payment\Domain\Details\AmazonOrderDetailsFactory;
-use PayWithAmazon\ResponseInterface;
+use AmazonPay\ResponseInterface;
 
 class AmazonGetOrderDetailsResponse
 {

diff --git a/src/Payment/Domain/AmazonRefundResponse.php b/src/Payment/Domain/AmazonRefundResponse.php
@@ -15,7 +15,7 @@
  */
 namespace Amazon\Payment\Domain;
 
-use PayWithAmazon\ResponseInterface;
+use AmazonPay\ResponseInterface;
 
 class AmazonRefundResponse extends AbstractAmazonRefundResponse
 {

diff --git a/src/Payment/Domain/AmazonSetOrderDetailsResponse.php b/src/Payment/Domain/AmazonSetOrderDetailsResponse.php
@@ -16,7 +16,7 @@
 namespace Amazon\Payment\Domain;
 
 use Amazon\Core\Exception\AmazonServiceUnavailableException;
-use PayWithAmazon\ResponseInterface;
+use AmazonPay\ResponseInterface;
 
 class AmazonSetOrderDetailsResponse
 {

diff --git a/src/Payment/Ipn/IpnHandler.php b/src/Payment/Ipn/IpnHandler.php
@@ -15,7 +15,7 @@
  */
 namespace Amazon\Payment\Ipn;
 
-use PayWithAmazon\IpnHandler as AmazonIpnHandler;
+use AmazonPay\IpnHandler as AmazonIpnHandler;
 
 class IpnHandler extends AmazonIpnHandler
 {

diff --git a/src/Payment/Ipn/IpnHandlerFactory.php b/src/Payment/Ipn/IpnHandlerFactory.php
@@ -18,7 +18,7 @@
 use Amazon\Core\Helper\Data;
 use Amazon\Core\Model\EnvironmentChecker;
 use Magento\Framework\ObjectManagerInterface;
-use PayWithAmazon\IpnHandlerInterface;
+use AmazonPay\IpnHandlerInterface;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 
@@ -54,7 +54,7 @@ public function __construct(
         EnvironmentChecker $environmentChecker,
         LoggerInterface $logger,
         Data $coreHelper,
-        $instanceName = '\\PayWithAmazon\\IpnHandlerInterface'
+        $instanceName = '\\AmazonPay\\IpnHandlerInterface'
     ) {
         $this->objectManager      = $objectManager;
         $this->instanceName       = $instanceName;

diff --git a/src/Payment/Ipn/IpnHandlerFactoryInterface.php b/src/Payment/Ipn/IpnHandlerFactoryInterface.php
@@ -15,7 +15,7 @@
  */
 namespace Amazon\Payment\Ipn;
 
-use PayWithAmazon\IpnHandlerInterface;
+use AmazonPay\IpnHandlerInterface;
 
 interface IpnHandlerFactoryInterface
 {

diff --git a/src/Payment/Ipn/MockIpnHandler.php b/src/Payment/Ipn/MockIpnHandler.php
@@ -15,7 +15,7 @@
  */
 namespace Amazon\Payment\Ipn;
 
-use PayWithAmazon\IpnHandler as AmazonIpnHandler;
+use AmazonPay\IpnHandler as AmazonIpnHandler;
 
 /**
  * Class MockIpnHandler

diff --git a/src/Payment/Model/AddressManagement.php b/src/Payment/Model/AddressManagement.php
@@ -29,7 +29,7 @@
 use Magento\Framework\Validator\Factory;
 use Magento\Framework\Webapi\Exception as WebapiException;
 use Magento\Quote\Model\Quote;
-use PayWithAmazon\ResponseInterface;
+use AmazonPay\ResponseInterface;
 use Psr\Log\LoggerInterface;
 
 class AddressManagement implements AddressManagementInterface

diff --git a/src/Payment/Model/OrderInformationManagement.php b/src/Payment/Model/OrderInformationManagement.php
@@ -30,7 +30,7 @@
 use Magento\Framework\Exception\ValidatorException;
 use Magento\Quote\Model\Quote;
 use Magento\Store\Model\ScopeInterface;
-use PayWithAmazon\ResponseInterface;
+use AmazonPay\ResponseInterface;
 use Psr\Log\LoggerInterface;
 
 class OrderInformationManagement implements OrderInformationManagementInterface

diff --git a/src/Payment/etc/di.xml b/src/Payment/etc/di.xml
@@ -11,7 +11,7 @@
     <preference for="Amazon\Payment\Api\Data\PendingAuthorizationInterface" type="Amazon\Payment\Model\PendingAuthorization" />
     <preference for="Amazon\Payment\Api\Data\PendingRefundInterface" type="Amazon\Payment\Model\PendingRefund" />
     <preference for="Amazon\Payment\Ipn\IpnHandlerFactoryInterface" type="Amazon\Payment\Ipn\IpnHandlerFactory" />
-    <preference for="PayWithAmazon\IpnHandlerInterface" type="Amazon\Payment\Ipn\IpnHandler" />
+    <preference for="AmazonPay\IpnHandlerInterface" type="Amazon\Payment\Ipn\IpnHandler" />
     <preference for="Amazon\Payment\Api\Ipn\CompositeProcessorInterface" type="Amazon\Payment\Model\Ipn\CompositeProcessor" />
     <type name="Magento\Quote\Api\CartRepositoryInterface">
         <plugin name="amazon_payment_quote_repository" type="Amazon\Payment\Plugin\QuoteRepository" sortOrder="1" />