#27500 PHPUnit9 for Sales module

Author: lbajsarowicz

app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractItemsTest.php

@@ -1,8 +1,10 @@
-<?php declare(strict_types=1);
+<?php
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Test\Unit\Block\Adminhtml\Items;
 
 use Magento\Backend\Block\Template\Context;
@@ -40,17 +42,17 @@ protected function setUp(): void
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->stockRegistry = $this->getMockBuilder(StockRegistry::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getStockItem', '__wakeup'])
+            ->setMethods(['getStockItem'])
             ->getMock();
 
         $this->stockItemMock = $this->createPartialMock(
             Item::class,
-            ['getManageStock', '__wakeup']
+            ['getManageStock']
         );
 
         $this->stockRegistry->expects($this->any())
             ->method('getStockItem')
-            ->will($this->returnValue($this->stockItemMock));
+            ->willReturn($this->stockItemMock);
     }
 
     public function testGetItemRenderer()
@@ -62,11 +64,11 @@ public function testGetItemRenderer()
         $layout->expects($this->any())
             ->method('getChildName')
             ->with(null, 'some-type')
-            ->will($this->returnValue('column_block-name'));
+            ->willReturn('column_block-name');
         $layout->expects($this->any())
             ->method('getGroupChildNames')
             ->with(null, 'column')
-            ->will($this->returnValue(['column_block-name']));
+            ->willReturn(['column_block-name']);
 
         /** @var DefaultRenderer $renderer */
         $renderer = $this->objectManagerHelper
@@ -76,7 +78,7 @@ public function testGetItemRenderer()
         $layout->expects($this->any())
             ->method('getBlock')
             ->with('column_block-name')
-            ->will($this->returnValue($renderer));
+            ->willReturn($renderer);
 
         /** @var AbstractItems $block */
         $block = $this->objectManagerHelper->getObject(AbstractItems::class);
@@ -93,16 +95,16 @@ public function testGetItemRendererThrowsExceptionForNonexistentRenderer()
         $renderer = $this->createMock(\stdClass::class);
         $layout = $this->createPartialMock(
             Layout::class,
-            ['getChildName', 'getBlock', '__wakeup']
+            ['getChildName', 'getBlock']
         );
         $layout->expects($this->at(0))
             ->method('getChildName')
             ->with(null, 'some-type')
-            ->will($this->returnValue('some-block-name'));
+            ->willReturn('some-block-name');
         $layout->expects($this->at(1))
             ->method('getBlock')
             ->with('some-block-name')
-            ->will($this->returnValue($renderer));
+            ->willReturn($renderer);
 
         /** @var \Magento\Sales\Block\Adminhtml\Items\AbstractItems $block */
         $block = $this->objectManagerHelper->getObject(
@@ -128,10 +130,12 @@ public function testCanReturnItemToStock($canReturnToStock, $itemConfig, $result
     {
         $productId = isset($itemConfig['product_id']) ? $itemConfig['product_id'] : null;
         $manageStock = isset($itemConfig['manage_stock']) ? $itemConfig['manage_stock'] : null;
-        $item = $this->createPartialMock(
-            \Magento\Sales\Model\Order\Creditmemo\Item::class,
-            ['hasCanReturnToStock', 'getOrderItem', 'setCanReturnToStock', 'getCanReturnToStock', '__wakeup']
-        );
+        $item = $this->getMockBuilder(\Magento\Sales\Model\Order\Creditmemo\Item::class)->addMethods(
+            ['hasCanReturnToStock', 'setCanReturnToStock', 'getCanReturnToStock']
+        )
+            ->onlyMethods(['getOrderItem'])
+            ->disableOriginalConstructor()
+            ->getMock();
         $dependencies = $this->prepareServiceMockDependency(
             $item,
             $canReturnToStock,
@@ -162,45 +166,44 @@ protected function prepareServiceMockDependency($item, $canReturnToStock, $produ
 
         $this->stockItemMock->expects($this->any())
             ->method('getManageStock')
-            ->will($this->returnValue($manageStock));
+            ->willReturn($manageStock);
         $dependencies['stockRegistry'] = $this->stockRegistry;
 
         $item->expects($this->once())
             ->method('hasCanReturnToStock')
-            ->will($this->returnValue($itemConfig['has_can_return_to_stock']));
+            ->willReturn($itemConfig['has_can_return_to_stock']);
         if (!$itemConfig['has_can_return_to_stock']) {
             $orderItem = $this->createPartialMock(
                 \Magento\Sales\Model\Order\Item::class,
-                ['getProductId', '__wakeup', 'getStore']
+                ['getProductId', 'getStore']
             );
 
             $store = $this->createPartialMock(Store::class, ['getWebsiteId']);
             $store->expects($this->once())
                 ->method('getWebsiteId')
-                ->will($this->returnValue(10));
+                ->willReturn(10);
             $orderItem->expects($this->once())
                 ->method('getStore')
-                ->will($this->returnValue($store));
+                ->willReturn($store);
 
             $orderItem->expects($this->once())
                 ->method('getProductId')
-                ->will($this->returnValue($productId));
+                ->willReturn($productId);
             $item->expects($this->any())
                 ->method('getOrderItem')
-                ->will($this->returnValue($orderItem));
+                ->willReturn($orderItem);
             if ($productId && $manageStock) {
                 $canReturn = true;
             } else {
                 $canReturn = false;
             }
             $item->expects($this->once())
                 ->method('setCanReturnToStock')
-                ->with($this->equalTo($canReturn))
-                ->will($this->returnSelf());
+                ->with($canReturn)->willReturnSelf();
         }
         $item->expects($this->once())
             ->method('getCanReturnToStock')
-            ->will($this->returnValue($canReturnToStock));
+            ->willReturn($canReturnToStock);
 
         return $dependencies;
     }
@@ -209,11 +212,11 @@ public function testCanReturnItemToStockEmpty()
     {
         $stockConfiguration = $this->getMockBuilder(Configuration::class)
             ->disableOriginalConstructor()
-            ->setMethods(['canSubtractQty', '__wakeup'])
+            ->setMethods(['canSubtractQty'])
             ->getMock();
         $stockConfiguration->expects($this->once())
             ->method('canSubtractQty')
-            ->will($this->returnValue(true));
+            ->willReturn(true);
 
         /** @var \Magento\Sales\Block\Adminhtml\Items\AbstractItems $block */
         $block = $this->objectManagerHelper->getObject(

app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractTest.php

@@ -1,8 +1,10 @@
-<?php declare(strict_types=1);
+<?php
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Test\Unit\Block\Adminhtml\Items;
 
 use Magento\Backend\Block\Template\Context;
@@ -27,7 +29,7 @@ public function testGetItemRenderer()
         $renderer = $this->createMock(AbstractBlock::class);
         $layout = $this->createPartialMock(
             Layout::class,
-            ['getChildName', 'getBlock', 'getGroupChildNames', '__wakeup']
+            ['getChildName', 'getBlock', 'getGroupChildNames']
         );
         $layout->expects(
             $this->at(0)
@@ -36,17 +38,17 @@ public function testGetItemRenderer()
         )->with(
             null,
             'some-type'
-        )->will(
-            $this->returnValue('some-block-name')
+        )->willReturn(
+            'some-block-name'
         );
         $layout->expects(
             $this->at(1)
         )->method(
             'getBlock'
         )->with(
             'some-block-name'
-        )->will(
-            $this->returnValue($renderer)
+        )->willReturn(
+            $renderer
         );
 
         /** @var AbstractItems $block */
@@ -70,7 +72,7 @@ public function testGetItemRendererThrowsExceptionForNonexistentRenderer()
         $renderer = $this->createMock(\stdClass::class);
         $layout = $this->createPartialMock(
             Layout::class,
-            ['getChildName', 'getBlock', '__wakeup']
+            ['getChildName', 'getBlock']
         );
         $layout->expects(
             $this->at(0)
@@ -79,17 +81,17 @@ public function testGetItemRendererThrowsExceptionForNonexistentRenderer()
         )->with(
             null,
             'some-type'
-        )->will(
-            $this->returnValue('some-block-name')
+        )->willReturn(
+            'some-block-name'
         );
         $layout->expects(
             $this->at(1)
         )->method(
             'getBlock'
         )->with(
             'some-block-name'
-        )->will(
-            $this->returnValue($renderer)
+        )->willReturn(
+            $renderer
         );
 
         /** @var AbstractItems $block */

app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/Column/DefaultColumnTest.php

@@ -1,8 +1,10 @@
-<?php declare(strict_types=1);
+<?php
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Test\Unit\Block\Adminhtml\Items\Column;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
@@ -34,7 +36,7 @@ protected function setUp(): void
         );
         $this->itemMock = $this->getMockBuilder(Item::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getRowTotal', 'getDiscountAmount', 'getBaseRowTotal', 'getBaseDiscountAmount', '__wakeup'])
+            ->setMethods(['getRowTotal', 'getDiscountAmount', 'getBaseRowTotal', 'getBaseDiscountAmount'])
             ->getMock();
     }
 
@@ -45,10 +47,10 @@ public function testGetTotalAmount()
         $expectedResult = 8;
         $this->itemMock->expects($this->once())
             ->method('getRowTotal')
-            ->will($this->returnValue($rowTotal));
+            ->willReturn($rowTotal);
         $this->itemMock->expects($this->once())
             ->method('getDiscountAmount')
-            ->will($this->returnValue($discountAmount));
+            ->willReturn($discountAmount);
         $this->assertEquals($expectedResult, $this->defaultColumn->getTotalAmount($this->itemMock));
     }
 
@@ -59,10 +61,10 @@ public function testGetBaseTotalAmount()
         $expectedResult = 8;
         $this->itemMock->expects($this->once())
             ->method('getBaseRowTotal')
-            ->will($this->returnValue($baseRowTotal));
+            ->willReturn($baseRowTotal);
         $this->itemMock->expects($this->once())
             ->method('getBaseDiscountAmount')
-            ->will($this->returnValue($baseDiscountAmount));
+            ->willReturn($baseDiscountAmount);
         $this->assertEquals($expectedResult, $this->defaultColumn->getBaseTotalAmount($this->itemMock));
     }
 }

app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Comments/ViewTest.php

@@ -1,8 +1,10 @@
-<?php declare(strict_types=1);
+<?php
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Test\Unit\Block\Adminhtml\Order\Comments;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -48,7 +50,7 @@ public function testEscapeHtml($data, $expected, $allowedTags = null)
         $this->adminHelperMock
             ->expects($this->any())
             ->method('escapeHtmlWithLinks')
-            ->will($this->returnValue($expected));
+            ->willReturn($expected);
         $actual = $this->commentsView->escapeHtml($data, $allowedTags);
         $this->assertEquals($expected, $actual);
     }

app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/AbstractCreateTest.php

@@ -1,8 +1,9 @@
-<?php declare(strict_types=1);
+<?php
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Sales\Test\Unit\Block\Adminhtml\Order\Create;
 

app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/CustomerTest.php

@@ -1,8 +1,10 @@
-<?php declare(strict_types=1);
+<?php
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Test\Unit\Block\Adminhtml\Order\Create;
 
 use Magento\Backend\Block\Template\Context;
@@ -17,7 +19,7 @@ public function testGetButtonsHtml()
     {
         $contextMock = $this->createPartialMock(Context::class, ['getAuthorization']);
         $authorizationMock = $this->createMock(AuthorizationInterface::class);
-        $contextMock->expects($this->any())->method('getAuthorization')->will($this->returnValue($authorizationMock));
+        $contextMock->expects($this->any())->method('getAuthorization')->willReturn($authorizationMock);
         $arguments = ['context' => $contextMock];
 
         $helper = new ObjectManager($this);
@@ -27,7 +29,7 @@ public function testGetButtonsHtml()
         $authorizationMock->expects($this->atLeastOnce())
             ->method('isAllowed')
             ->with('Magento_Customer::manage')
-            ->will($this->returnValue(false));
+            ->willReturn(false);
 
         $this->assertEmpty($block->getButtonsHtml());
     }