Skip to content

Commit 9d992d0

Browse files
committed
refactoring, static test fixes
1 parent 854b044 commit 9d992d0

File tree

2 files changed

+30
-10
lines changed

2 files changed

+30
-10
lines changed

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
use Magento\Framework\DataObject;
1010

1111
/**
12+
* Produce html output using the given data source.
13+
*
14+
* phpcs:disable Magento2.Classes.AbstractApi
1215
* Backend grid item abstract renderer
1316
* @api
1417
* @SuppressWarnings(PHPMD.NumberOfChildren)
@@ -53,7 +56,7 @@ public function getColumn()
5356
* Renders grid column
5457
*
5558
* @param DataObject $row
56-
* @return string
59+
* @return string
5760
*/
5861
public function render(DataObject $row)
5962
{
@@ -90,6 +93,7 @@ protected function _getValue(DataObject $row)
9093
if (is_string($getter)) {
9194
return $row->{$getter}();
9295
} elseif (is_callable($getter)) {
96+
//phpcs:ignore Magento2.Functions.DiscouragedFunction
9397
return call_user_func($getter, $row);
9498
}
9599
return '';

app/code/Magento/Payment/Test/Unit/Gateway/Data/PaymentDataObjectTest.php

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,45 +5,61 @@
55
*/
66
namespace Magento\Payment\Test\Unit\Gateway\Data;
77

8-
use Magento\Payment\Gateway\Data\PaymentDataObject;
98
use Magento\Payment\Gateway\Data\OrderAdapterInterface;
9+
use Magento\Payment\Gateway\Data\PaymentDataObject;
1010
use Magento\Payment\Model\InfoInterface;
11+
use PHPUnit\Framework\MockObject\MockObject;
1112

1213
/**
13-
* Class PaymentDataObjectTest
14+
* Tests for PaymentDataObject
1415
*/
1516
class PaymentDataObjectTest extends \PHPUnit\Framework\TestCase
1617
{
17-
/** @var PaymentDataObject */
18+
/**
19+
* @var PaymentDataObject
20+
*/
1821
protected $model;
1922

2023
/**
21-
* @var OrderAdapterInterface|\PHPUnit_Framework_MockObject_MockObject
24+
* @var OrderAdapterInterface|MockObject
2225
*/
2326
protected $orderMock;
2427

2528
/**
26-
* @var InfoInterface|\PHPUnit_Framework_MockObject_MockObject
29+
* @var InfoInterface|\MockObject
2730
*/
2831
protected $paymentMock;
2932

33+
/**
34+
* @inheritdoc
35+
*/
3036
protected function setUp()
3137
{
32-
$this->orderMock = $this->getMockBuilder(\Magento\Payment\Gateway\Data\OrderAdapterInterface::class)
38+
$this->orderMock = $this->getMockBuilder(OrderAdapterInterface::class)
3339
->getMockForAbstractClass();
3440

35-
$this->paymentMock = $this->getMockBuilder(\Magento\Payment\Model\InfoInterface::class)
41+
$this->paymentMock = $this->getMockBuilder(InfoInterface::class)
3642
->getMockForAbstractClass();
3743

3844
$this->model = new PaymentDataObject($this->orderMock, $this->paymentMock);
3945
}
4046

41-
public function testGetOrder()
47+
/**
48+
* Verify can get order
49+
*
50+
* @return void
51+
*/
52+
public function testGetOrder(): void
4253
{
4354
$this->assertSame($this->orderMock, $this->model->getOrder());
4455
}
4556

46-
public function testGetPayment()
57+
/**
58+
* Verify can get payment
59+
*
60+
* @return void
61+
*/
62+
public function testGetPayment(): void
4763
{
4864
$this->assertSame($this->paymentMock, $this->model->getPayment());
4965
}

0 commit comments

Comments
 (0)