MAGETWO-60054: Revert major changes in PaymentAdapter

valdislav · valdislav · commit f13063c80578 · 2016-10-28T13:43:56.000+03:00
diff --git a/app/code/Magento/Sales/Model/Order/PaymentAdapter.php b/app/code/Magento/Sales/Model/Order/PaymentAdapter.php
@@ -12,40 +12,20 @@
  */
 class PaymentAdapter implements PaymentAdapterInterface
 {
-    /**
-     * @var \Magento\Sales\Model\Order\Creditmemo\RefundOperation
-     */
-    private $refundOperation;
-
     /**
      * @var \Magento\Sales\Model\Order\Invoice\PayOperation
      */
     private $payOperation;
 
     /**
-     * PaymentAdapter constructor.
-     * @param \Magento\Sales\Model\Order\Creditmemo\RefundOperation $refundOperation
      * @param \Magento\Sales\Model\Order\Invoice\PayOperation $payOperation
      */
     public function __construct(
-        \Magento\Sales\Model\Order\Creditmemo\RefundOperation $refundOperation,
         \Magento\Sales\Model\Order\Invoice\PayOperation $payOperation
     ) {
-        $this->refundOperation = $refundOperation;
         $this->payOperation = $payOperation;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function refund(
-        \Magento\Sales\Api\Data\CreditmemoInterface $creditmemo,
-        \Magento\Sales\Api\Data\OrderInterface $order,
-        $isOnline = false
-    ) {
-        return $this->refundOperation->execute($creditmemo, $order, $isOnline);
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/app/code/Magento/Sales/Model/Order/PaymentAdapterInterface.php b/app/code/Magento/Sales/Model/Order/PaymentAdapterInterface.php
@@ -23,16 +23,4 @@ interface PaymentAdapterInterface
      * @return OrderInterface
      */
     public function pay(OrderInterface $order, InvoiceInterface $invoice, $capture);
-
-    /**
-     * @param \Magento\Sales\Api\Data\CreditmemoInterface $creditmemo
-     * @param \Magento\Sales\Api\Data\OrderInterface $order
-     * @param bool $isOnline
-     * @return \Magento\Sales\Api\Data\OrderInterface
-     */
-    public function refund(
-        \Magento\Sales\Api\Data\CreditmemoInterface $creditmemo,
-        \Magento\Sales\Api\Data\OrderInterface $order,
-        $isOnline = false
-    );
 }
diff --git a/app/code/Magento/Sales/Model/Order/RefundAdapter.php b/app/code/Magento/Sales/Model/Order/RefundAdapter.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Model\Order;
+
+/**
+ * Class RefundAdapter
+ */
+class RefundAdapter implements RefundAdapterInterface
+{
+    /**
+     * @var \Magento\Sales\Model\Order\Creditmemo\RefundOperation
+     */
+    private $refundOperation;
+
+    /**
+     * PaymentAdapter constructor.
+     *
+     * @param \Magento\Sales\Model\Order\Creditmemo\RefundOperation $refundOperation
+     */
+    public function __construct(
+        \Magento\Sales\Model\Order\Creditmemo\RefundOperation $refundOperation
+    ) {
+        $this->refundOperation = $refundOperation;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function refund(
+        \Magento\Sales\Api\Data\CreditmemoInterface $creditmemo,
+        \Magento\Sales\Api\Data\OrderInterface $order,
+        $isOnline = false
+    ) {
+        return $this->refundOperation->execute($creditmemo, $order, $isOnline);
+    }
+}
diff --git a/app/code/Magento/Sales/Model/Order/RefundAdapterInterface.php b/app/code/Magento/Sales/Model/Order/RefundAdapterInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Model\Order;
+
+/**
+ * Interface RefundAdapterInterface
+ *
+ * @api
+ */
+interface RefundAdapterInterface
+{
+    /**
+     * @param \Magento\Sales\Api\Data\CreditmemoInterface $creditmemo
+     * @param \Magento\Sales\Api\Data\OrderInterface $order
+     * @param bool $isOnline
+     * @return \Magento\Sales\Api\Data\OrderInterface
+     */
+    public function refund(
+        \Magento\Sales\Api\Data\CreditmemoInterface $creditmemo,
+        \Magento\Sales\Api\Data\OrderInterface $order,
+        $isOnline = false
+    );
+}
diff --git a/app/code/Magento/Sales/Model/RefundInvoice.php b/app/code/Magento/Sales/Model/RefundInvoice.php
@@ -15,7 +15,7 @@
 use Magento\Sales\Model\Order\CreditmemoDocumentFactory;
 use Magento\Sales\Model\Order\Validation\RefundInvoiceInterface as RefundInvoiceValidator;
 use Magento\Sales\Model\Order\OrderStateResolverInterface;
-use Magento\Sales\Model\Order\PaymentAdapterInterface;
+use Magento\Sales\Model\Order\RefundAdapterInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -50,9 +50,9 @@ class RefundInvoice implements RefundInvoiceInterface
     private $creditmemoRepository;
 
     /**
-     * @var PaymentAdapterInterface
+     * @var RefundAdapterInterface
      */
-    private $paymentAdapter;
+    private $refundAdapter;
 
     /**
      * @var CreditmemoDocumentFactory
@@ -88,7 +88,7 @@ class RefundInvoice implements RefundInvoiceInterface
      * @param InvoiceRepositoryInterface $invoiceRepository
      * @param RefundInvoiceValidator $validator
      * @param CreditmemoRepositoryInterface $creditmemoRepository
-     * @param PaymentAdapterInterface $paymentAdapter
+     * @param RefundAdapterInterface $refundAdapter
      * @param CreditmemoDocumentFactory $creditmemoDocumentFactory
      * @param NotifierInterface $notifier
      * @param OrderConfig $config
@@ -102,7 +102,7 @@ public function __construct(
         InvoiceRepositoryInterface $invoiceRepository,
         RefundInvoiceValidator $validator,
         CreditmemoRepositoryInterface $creditmemoRepository,
-        PaymentAdapterInterface $paymentAdapter,
+        RefundAdapterInterface $refundAdapter,
         CreditmemoDocumentFactory $creditmemoDocumentFactory,
         NotifierInterface $notifier,
         OrderConfig $config,
@@ -114,7 +114,7 @@ public function __construct(
         $this->invoiceRepository = $invoiceRepository;
         $this->validator = $validator;
         $this->creditmemoRepository = $creditmemoRepository;
-        $this->paymentAdapter = $paymentAdapter;
+        $this->refundAdapter = $refundAdapter;
         $this->creditmemoDocumentFactory = $creditmemoDocumentFactory;
         $this->notifier = $notifier;
         $this->config = $config;
@@ -164,7 +164,7 @@ public function execute(
         try {
             $creditmemo->setState(\Magento\Sales\Model\Order\Creditmemo::STATE_REFUNDED);
             $order->setCustomerNoteNotify($notify);
-            $order = $this->paymentAdapter->refund($creditmemo, $order, $isOnline);
+            $order = $this->refundAdapter->refund($creditmemo, $order, $isOnline);
             $order->setState(
                 $this->orderStateResolver->getStateForOrder($order, [])
             );
diff --git a/app/code/Magento/Sales/Model/RefundOrder.php b/app/code/Magento/Sales/Model/RefundOrder.php
@@ -13,7 +13,7 @@
 use Magento\Sales\Model\Order\Creditmemo\NotifierInterface;
 use Magento\Sales\Model\Order\CreditmemoDocumentFactory;
 use Magento\Sales\Model\Order\OrderStateResolverInterface;
-use Magento\Sales\Model\Order\PaymentAdapterInterface;
+use Magento\Sales\Model\Order\RefundAdapterInterface;
 use Magento\Sales\Model\Order\Validation\RefundOrderInterface as RefundOrderValidator;
 use Psr\Log\LoggerInterface;
 
@@ -44,9 +44,9 @@ class RefundOrder implements RefundOrderInterface
     private $creditmemoRepository;
 
     /**
-     * @var PaymentAdapterInterface
+     * @var RefundAdapterInterface
      */
-    private $paymentAdapter;
+    private $refundAdapter;
 
     /**
      * @var CreditmemoDocumentFactory
@@ -80,7 +80,7 @@ class RefundOrder implements RefundOrderInterface
      * @param OrderStateResolverInterface $orderStateResolver
      * @param OrderRepositoryInterface $orderRepository
      * @param CreditmemoRepositoryInterface $creditmemoRepository
-     * @param PaymentAdapterInterface $paymentAdapter
+     * @param RefundAdapterInterface $refundAdapter
      * @param CreditmemoDocumentFactory $creditmemoDocumentFactory
      * @param RefundOrderValidator $validator
      * @param NotifierInterface $notifier
@@ -93,7 +93,7 @@ public function __construct(
         OrderStateResolverInterface $orderStateResolver,
         OrderRepositoryInterface $orderRepository,
         CreditmemoRepositoryInterface $creditmemoRepository,
-        PaymentAdapterInterface $paymentAdapter,
+        RefundAdapterInterface $refundAdapter,
         CreditmemoDocumentFactory $creditmemoDocumentFactory,
         RefundOrderValidator $validator,
         NotifierInterface $notifier,
@@ -104,7 +104,7 @@ public function __construct(
         $this->orderStateResolver = $orderStateResolver;
         $this->orderRepository = $orderRepository;
         $this->creditmemoRepository = $creditmemoRepository;
-        $this->paymentAdapter = $paymentAdapter;
+        $this->refundAdapter = $refundAdapter;
         $this->creditmemoDocumentFactory = $creditmemoDocumentFactory;
         $this->validator = $validator;
         $this->notifier = $notifier;
@@ -150,7 +150,7 @@ public function execute(
         try {
             $creditmemo->setState(\Magento\Sales\Model\Order\Creditmemo::STATE_REFUNDED);
             $order->setCustomerNoteNotify($notify);
-            $order = $this->paymentAdapter->refund($creditmemo, $order);
+            $order = $this->refundAdapter->refund($creditmemo, $order);
             $order->setState(
                 $this->orderStateResolver->getStateForOrder($order, [])
             );
diff --git a/app/code/Magento/Sales/Model/Service/CreditmemoService.php b/app/code/Magento/Sales/Model/Service/CreditmemoService.php
@@ -53,9 +53,9 @@ class CreditmemoService implements \Magento\Sales\Api\CreditmemoManagementInterf
     private $resource;
 
     /**
-     * @var \Magento\Sales\Model\Order\PaymentAdapterInterface
+     * @var \Magento\Sales\Model\Order\RefundAdapterInterface
      */
-    private $paymentAdapter;
+    private $refundAdapter;
 
     /**
      * @var \Magento\Sales\Api\OrderRepositoryInterface
@@ -163,7 +163,7 @@ public function refund(
         $connection = $this->getResource()->getConnection('sales');
         $connection->beginTransaction();
         try {
-            $order = $this->getPaymentAdapter()->refund(
+            $order = $this->getRefundAdapter()->refund(
                 $creditmemo,
                 $creditmemo->getOrder(),
                 !$offlineRequested
@@ -219,17 +219,17 @@ protected function validateForRefund(\Magento\Sales\Api\Data\CreditmemoInterface
     }
 
     /**
-     * @return \Magento\Sales\Model\Order\PaymentAdapterInterface
+     * @return \Magento\Sales\Model\Order\RefundAdapterInterface
      *
      * @deprecated
      */
-    private function getPaymentAdapter()
+    private function getRefundAdapter()
     {
-        if ($this->paymentAdapter === null) {
-            $this->paymentAdapter = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Sales\Model\Order\PaymentAdapterInterface::class);
+        if ($this->refundAdapter === null) {
+            $this->refundAdapter = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Sales\Model\Order\RefundAdapterInterface::class);
         }
-        return $this->paymentAdapter;
+        return $this->refundAdapter;
     }
 
     /**
diff --git a/app/code/Magento/Sales/Test/Unit/Model/RefundInvoiceTest.php b/app/code/Magento/Sales/Test/Unit/Model/RefundInvoiceTest.php
@@ -20,7 +20,7 @@
 use Magento\Sales\Api\Data\CreditmemoItemCreationInterface;
 use Magento\Sales\Model\Order\CreditmemoDocumentFactory;
 use Magento\Sales\Model\Order\OrderStateResolverInterface;
-use Magento\Sales\Model\Order\PaymentAdapterInterface;
+use Magento\Sales\Model\Order\RefundAdapterInterface;
 use Magento\Sales\Model\Order\Creditmemo\NotifierInterface;
 use Magento\Sales\Model\Order\Validation\RefundInvoiceInterface;
 use Magento\Sales\Model\ValidatorResultInterface;
@@ -55,9 +55,9 @@ class RefundInvoiceTest extends \PHPUnit_Framework_TestCase
     private $creditmemoDocumentFactoryMock;
 
     /**
-     * @var PaymentAdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var RefundAdapterInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $paymentAdapterMock;
+    private $refundAdapterMock;
 
     /**
      * @var OrderStateResolverInterface|\PHPUnit_Framework_MockObject_MockObject
@@ -148,7 +148,7 @@ protected function setUp()
         $this->creditmemoDocumentFactoryMock = $this->getMockBuilder(CreditmemoDocumentFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->paymentAdapterMock = $this->getMockBuilder(PaymentAdapterInterface::class)
+        $this->refundAdapterMock = $this->getMockBuilder(RefundAdapterInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->refundInvoiceValidatorMock = $this->getMockBuilder(RefundInvoiceInterface::class)
@@ -212,7 +212,7 @@ protected function setUp()
             $this->invoiceRepositoryMock,
             $this->refundInvoiceValidatorMock,
             $this->creditmemoRepositoryMock,
-            $this->paymentAdapterMock,
+            $this->refundAdapterMock,
             $this->creditmemoDocumentFactoryMock,
             $this->notifierMock,
             $this->configMock,
@@ -268,7 +268,7 @@ public function testOrderCreditmemo($invoiceId, $isOnline, $items, $notify, $app
         $hasMessages = false;
         $this->validationMessagesMock->expects($this->once())
             ->method('hasMessages')->willReturn($hasMessages);
-        $this->paymentAdapterMock->expects($this->once())
+        $this->refundAdapterMock->expects($this->once())
             ->method('refund')
             ->with($this->creditmemoMock, $this->orderMock)
             ->willReturn($this->orderMock);
@@ -440,7 +440,7 @@ public function testCouldNotCreditmemoException()
             ->method('hasMessages')->willReturn($hasMessages);
         $e = new \Exception();
 
-        $this->paymentAdapterMock->expects($this->once())
+        $this->refundAdapterMock->expects($this->once())
             ->method('refund')
             ->with($this->creditmemoMock, $this->orderMock)
             ->willThrowException($e);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/RefundOrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/RefundOrderTest.php
@@ -18,7 +18,7 @@
 use Magento\Sales\Model\Order\CreditmemoDocumentFactory;
 use Magento\Sales\Model\Order\OrderStateResolverInterface;
 use Magento\Sales\Model\Order\Validation\RefundOrderInterface;
-use Magento\Sales\Model\Order\PaymentAdapterInterface;
+use Magento\Sales\Model\Order\RefundAdapterInterface;
 use Magento\Sales\Model\Order\Creditmemo\NotifierInterface;
 use Magento\Sales\Model\RefundOrder;
 use Magento\Sales\Model\ValidatorResultInterface;
@@ -48,9 +48,9 @@ class RefundOrderTest extends \PHPUnit_Framework_TestCase
     private $creditmemoDocumentFactoryMock;
 
     /**
-     * @var PaymentAdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var RefundAdapterInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $paymentAdapterMock;
+    private $refundAdapterMock;
 
     /**
      * @var OrderStateResolverInterface|\PHPUnit_Framework_MockObject_MockObject
@@ -136,7 +136,7 @@ protected function setUp()
         $this->refundOrderValidatorMock = $this->getMockBuilder(RefundOrderInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->paymentAdapterMock = $this->getMockBuilder(PaymentAdapterInterface::class)
+        $this->refundAdapterMock = $this->getMockBuilder(RefundAdapterInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->orderStateResolverMock = $this->getMockBuilder(OrderStateResolverInterface::class)
@@ -182,7 +182,7 @@ protected function setUp()
             $this->orderStateResolverMock,
             $this->orderRepositoryMock,
             $this->creditmemoRepositoryMock,
-            $this->paymentAdapterMock,
+            $this->refundAdapterMock,
             $this->creditmemoDocumentFactoryMock,
             $this->refundOrderValidatorMock,
             $this->notifierMock,
@@ -233,7 +233,7 @@ public function testOrderCreditmemo($orderId, $notify, $appendComment)
         $hasMessages = false;
         $this->validationMessagesMock->expects($this->once())
             ->method('hasMessages')->willReturn($hasMessages);
-        $this->paymentAdapterMock->expects($this->once())
+        $this->refundAdapterMock->expects($this->once())
             ->method('refund')
             ->with($this->creditmemoMock, $this->orderMock)
             ->willReturn($this->orderMock);
@@ -387,7 +387,7 @@ public function testCouldNotCreditmemoException()
         $this->validationMessagesMock->expects($this->once())
             ->method('hasMessages')->willReturn($hasMessages);
         $e = new \Exception();
-        $this->paymentAdapterMock->expects($this->once())
+        $this->refundAdapterMock->expects($this->once())
             ->method('refund')
             ->with($this->creditmemoMock, $this->orderMock)
             ->willThrowException($e);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php b/app/code/Magento/Sales/Test/Unit/Model/Service/CreditmemoServiceTest.php
diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml
