Skip to content

Commit 937f9e5

Browse files
fix mftf, static
1 parent 1f0bcbf commit 937f9e5

File tree

5 files changed

+12
-23
lines changed

5 files changed

+12
-23
lines changed

app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88

99
use Magento\Framework\DataObject;
1010
use Magento\Sales\Api\CreditmemoRepositoryInterface;
11-
use \Magento\Sales\Model\Order\CreditmemoFactory;
11+
use Magento\Sales\Model\Order;
12+
use Magento\Sales\Model\Order\CreditmemoFactory;
1213

1314
/**
14-
* Class CreditmemoLoader
15+
* Loader for creditmemo
1516
*
16-
* @package Magento\Sales\Controller\Adminhtml\Order
1717
* @method CreditmemoLoader setCreditmemoId($id)
1818
* @method CreditmemoLoader setCreditmemo($creditMemo)
1919
* @method CreditmemoLoader setInvoiceId($id)
@@ -22,6 +22,7 @@
2222
* @method string getCreditmemo()
2323
* @method int getInvoiceId()
2424
* @method int getOrderId()
25+
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
2526
*/
2627
class CreditmemoLoader extends DataObject
2728
{
@@ -129,7 +130,8 @@ protected function _getItemData()
129130

130131
/**
131132
* Check if creditmeno can be created for order
132-
* @param \Magento\Sales\Model\Order $order
133+
*
134+
* @param Order $order
133135
* @return bool
134136
*/
135137
protected function _canCreditmemo($order)
@@ -153,7 +155,9 @@ protected function _canCreditmemo($order)
153155
}
154156

155157
/**
156-
* @param \Magento\Sales\Model\Order $order
158+
* Inits invoice
159+
*
160+
* @param Order $order
157161
* @return $this|bool
158162
*/
159163
protected function _initInvoice($order)

app/code/Magento/Sales/Test/Mftf/Test/AdminOpenCreditmemoViewPageWithWrongCreditmemoIdTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
<seeInCurrentUrl url="{{AdminCreditMemosGridPage.url}}" stepKey="redirectToCreditMemosGridPage"/>
3535

36-
<see selector="{{AdminMessagesSection.error}}" userInput='This creditmemo no longer exists.'
37-
stepKey="seeErrorMessage"/>
36+
<actionGroup ref="AssertAdminPageIs404ActionGroup" stepKey="see404PageOnAdmin"/>
3837
</test>
3938
</tests>

app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/ViewTest.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,6 @@ class ViewTest extends TestCase
143143
*/
144144
protected function setUp(): void
145145
{
146-
$titleMock = $this->getMockBuilder(\Magento\Framework\App\Action\Title::class)
147-
->disableOriginalConstructor()
148-
->getMock();
149146
$this->invoiceMock = $this->getMockBuilder(Invoice::class)
150147
->disableOriginalConstructor()
151148
->getMock();
@@ -238,9 +235,6 @@ protected function setUp(): void
238235
$this->contextMock->expects($this->any())
239236
->method('getObjectManager')
240237
->willReturn($this->objectManagerMock);
241-
$this->contextMock->expects($this->any())
242-
->method('getTitle')
243-
->willReturn($titleMock);
244238
$this->contextMock->expects($this->any())
245239
->method('getMessageManager')
246240
->willReturn($this->messageManagerMock);
@@ -272,7 +266,7 @@ public function testExecuteNoCreditMemo()
272266
$this->loaderMock->expects($this->once())
273267
->method('load')
274268
->willReturn(false);
275-
269+
276270
$this->prepareRedirect();
277271
$this->setPath('sales/creditmemo');
278272
$this->assertInstanceOf(

app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/ViewTest.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,6 @@ protected function setUp(): void
127127
->disableOriginalConstructor()
128128
->setMethods([])
129129
->getMock();
130-
$this->titleMock = $this->getMockBuilder(\Magento\Framework\App\Action\Title::class)
131-
->disableOriginalConstructor()
132-
->setMethods([])
133-
->getMock();
134130
$this->viewMock = $this->getMockBuilder(\Magento\Framework\App\View::class)
135131
->disableOriginalConstructor()
136132
->setMethods([])
@@ -176,9 +172,6 @@ protected function setUp(): void
176172
$contextMock->expects($this->any())
177173
->method('getResponse')
178174
->willReturn($this->responseMock);
179-
$contextMock->expects($this->any())
180-
->method('getTitle')
181-
->willReturn($this->titleMock);
182175
$contextMock->expects($this->any())
183176
->method('getView')
184177
->willReturn($this->viewMock);

app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
use Magento\Sales\Api\Data\ShipmentItemCreationInterface;
1919

2020
/**
21-
* Class ShipmentLoader
21+
* Loader for shipment
2222
*
23-
* @package Magento\Shipping\Controller\Adminhtml\Order
2423
* @method ShipmentLoader setOrderId($id)
2524
* @method ShipmentLoader setShipmentId($id)
2625
* @method ShipmentLoader setShipment($shipment)

0 commit comments

Comments
 (0)