Skip to content

Commit 6f72690

Browse files
committed
MAGETWO-60054: Revert major changes in PaymentAdapter
review fixes
1 parent 2317bc9 commit 6f72690

File tree

4 files changed

+36
-28
lines changed

4 files changed

+36
-28
lines changed

app/code/Magento/Sales/Model/Order/PaymentAdapter.php

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,35 @@
55
*/
66
namespace Magento\Sales\Model\Order;
77

8+
use Magento\Sales\Api\Data\InvoiceInterface;
9+
use Magento\Sales\Api\Data\OrderInterface;
10+
use Magento\Sales\Model\Order\Invoice\PayOperation;
11+
812
/**
9-
* Payment adapter.
10-
*
11-
* @api
13+
* @inheritdoc
1214
*/
1315
class PaymentAdapter implements PaymentAdapterInterface
1416
{
1517
/**
16-
* @var \Magento\Sales\Model\Order\Invoice\PayOperation
18+
* @var PayOperation
1719
*/
1820
private $payOperation;
1921

2022
/**
21-
* @param \Magento\Sales\Model\Order\Invoice\PayOperation $payOperation
23+
* @param PayOperation $payOperation
2224
*/
2325
public function __construct(
24-
\Magento\Sales\Model\Order\Invoice\PayOperation $payOperation
26+
PayOperation $payOperation
2527
) {
2628
$this->payOperation = $payOperation;
2729
}
2830

2931
/**
30-
* {@inheritdoc}
32+
* @inheritdoc
3133
*/
3234
public function pay(
33-
\Magento\Sales\Api\Data\OrderInterface $order,
34-
\Magento\Sales\Api\Data\InvoiceInterface $invoice,
35+
OrderInterface $order,
36+
InvoiceInterface $invoice,
3537
$capture
3638
) {
3739
return $this->payOperation->execute($order, $invoice, $capture);

app/code/Magento/Sales/Model/Order/PaymentAdapterInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
namespace Magento\Sales\Model\Order;
87

98
use Magento\Sales\Api\Data\InvoiceInterface;
109
use Magento\Sales\Api\Data\OrderInterface;
1110

1211
/**
13-
* Interface PaymentAdapterInterface
12+
* Encapsulates payment operation behind unified interface.
13+
* Can be used as extension point.
1414
*
1515
* @api
1616
*/

app/code/Magento/Sales/Model/Order/RefundAdapter.php

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,39 @@
11
<?php
22
/**
3-
* Copyright © 2016 Magento. All rights reserved.
3+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66
namespace Magento\Sales\Model\Order;
77

8+
use Magento\Sales\Api\Data\CreditmemoInterface;
9+
use Magento\Sales\Api\Data\OrderInterface;
10+
use Magento\Sales\Model\Order\Creditmemo\RefundOperation;
11+
812
/**
9-
* Class RefundAdapter
13+
* @inheritdoc
1014
*/
1115
class RefundAdapter implements RefundAdapterInterface
1216
{
1317
/**
14-
* @var \Magento\Sales\Model\Order\Creditmemo\RefundOperation
18+
* @var RefundOperation
1519
*/
1620
private $refundOperation;
1721

1822
/**
19-
* PaymentAdapter constructor.
20-
*
21-
* @param \Magento\Sales\Model\Order\Creditmemo\RefundOperation $refundOperation
23+
* @param RefundOperation $refundOperation
2224
*/
2325
public function __construct(
24-
\Magento\Sales\Model\Order\Creditmemo\RefundOperation $refundOperation
26+
RefundOperation $refundOperation
2527
) {
2628
$this->refundOperation = $refundOperation;
2729
}
2830

2931
/**
30-
* {@inheritdoc}
32+
* @inheritdoc
3133
*/
3234
public function refund(
33-
\Magento\Sales\Api\Data\CreditmemoInterface $creditmemo,
34-
\Magento\Sales\Api\Data\OrderInterface $order,
35+
CreditmemoInterface $creditmemo,
36+
OrderInterface $order,
3537
$isOnline = false
3638
) {
3739
return $this->refundOperation->execute($creditmemo, $order, $isOnline);
Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,30 @@
11
<?php
22
/**
3-
* Copyright © 2016 Magento. All rights reserved.
3+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66
namespace Magento\Sales\Model\Order;
77

8+
use Magento\Sales\Api\Data\CreditmemoInterface;
9+
use Magento\Sales\Api\Data\OrderInterface;
10+
811
/**
9-
* Interface RefundAdapterInterface
12+
* Encapsulates refund operation behind unified interface.
13+
* Can be used as extension point.
1014
*
1115
* @api
1216
*/
1317
interface RefundAdapterInterface
1418
{
1519
/**
16-
* @param \Magento\Sales\Api\Data\CreditmemoInterface $creditmemo
17-
* @param \Magento\Sales\Api\Data\OrderInterface $order
20+
* @param CreditmemoInterface $creditmemo
21+
* @param OrderInterface $order
1822
* @param bool $isOnline
19-
* @return \Magento\Sales\Api\Data\OrderInterface
23+
* @return OrderInterface
2024
*/
2125
public function refund(
22-
\Magento\Sales\Api\Data\CreditmemoInterface $creditmemo,
23-
\Magento\Sales\Api\Data\OrderInterface $order,
26+
CreditmemoInterface $creditmemo,
27+
OrderInterface $order,
2428
$isOnline = false
2529
);
2630
}

0 commit comments

Comments
 (0)