Use php74 versions of tests

Author: lbajsarowicz

dev/tests/integration/testsuite/Magento/Customer/Model/CustomerRegistryTest.php

@@ -49,7 +49,7 @@ class CustomerRegistryTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -110,6 +110,7 @@ public function testRetrieveException(): void
         $customerId = 1;
         $this->expectException(NoSuchEntityException::class);
         $this->expectExceptionMessage(sprintf('No such entity with customerId = %s', $customerId));
+
         $this->model->retrieve($customerId);
     }
 
@@ -133,12 +134,12 @@ public function testRetrieveEmailException(): void
      */
     public function testRemove(): void
     {
+        $this->expectException(NoSuchEntityException::class);
         $customerId = 1;
         $customer = $this->model->retrieve($customerId);
         $this->assertInstanceOf(Customer::class, $customer);
         $this->customerResourceModel->delete($customer);
         $this->model->remove($customerId);
-        $this->expectException(NoSuchEntityException::class);
         $this->model->retrieve($customerId);
     }
 
@@ -150,12 +151,12 @@ public function testRemove(): void
      */
     public function testRemoveByEmail(): void
     {
+        $this->expectException(NoSuchEntityException::class);
         $email = '[email protected]';
         $customer = $this->model->retrieve(1);
         $this->assertInstanceOf(Customer::class, $customer);
         $this->customerResourceModel->delete($customer);
         $this->model->removeByEmail($email, $this->defaultWebsiteId);
-        $this->expectException(NoSuchEntityException::class);
         $this->model->retrieveByEmail($email, $customer->getWebsiteId());
     }
 

dev/tests/integration/testsuite/Magento/Review/Controller/Adminhtml/Customer/ProductReviewsTest.php

@@ -8,13 +8,30 @@
 namespace Magento\Review\Controller\Adminhtml\Customer;
 
 use Magento\Framework\App\Request\Http;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\View\LayoutInterface;
 use Magento\TestFramework\TestCase\AbstractBackendController;
 
 /**
  * Test for customer product reviews page.
+ *
+ * @magentoAppArea adminhtml
  */
 class ProductReviewsTest extends AbstractBackendController
 {
+    /** @var LayoutInterface  */
+    private $layout;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->layout = $this->_objectManager->get(LayoutInterface::class);
+    }
+
     /**
      * Check Customer product review action.
      *
@@ -23,9 +40,36 @@ class ProductReviewsTest extends AbstractBackendController
      */
     public function testProductReviewsAction(): void
     {
-        $this->getRequest()->setPostValue(['id' => 1])->setMethod(Http::METHOD_POST);
+        $this->dispatchWithIdParam(1);
+        $this->assertContains('<div id="reviewGrid"', $this->getResponse()->getBody());
+    }
+
+    /**
+     * @return void
+     */
+    public function testProductReviews(): void
+    {
+        $customerId = 1;
+        $this->dispatchWithIdParam($customerId);
+        $block = $this->layout->getBlock('admin.customer.reviews');
+        $this->assertNotFalse($block);
+        $this->assertEquals(
+            $customerId,
+            $block->getCustomerId(),
+            'Block customer id value does not match expected value'
+        );
+    }
+
+    /**
+     * Dispatch request with id parameter
+     *
+     * @param int $id
+     * @return void
+     */
+    private function dispatchWithIdParam(int $id): void
+    {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setParams(['id' => $id]);
         $this->dispatch('backend/review/customer/productReviews');
-        $body = $this->getResponse()->getBody();
-        $this->assertStringContainsString('<div id="reviewGrid"', $body);
     }
 }

dev/tests/integration/testsuite/Magento/Sales/Block/Order/Creditmemo/ItemsTest.php

@@ -52,7 +52,7 @@ class ItemsTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -68,7 +68,7 @@ protected function setUp()
     /**
      * @inheritdoc
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->registry->unregister('current_order');
 

dev/tests/integration/testsuite/Magento/Sales/Block/Order/Invoice/ItemsTest.php

@@ -53,7 +53,7 @@ class ItemsTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->registry = $this->objectManager->get(Registry::class);
@@ -67,7 +67,7 @@ protected function setUp()
     /**
      * @inheritdoc
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->registry->unregister('current_order');
 

dev/tests/integration/testsuite/Magento/Sales/Block/Order/ItemsTest.php

@@ -49,7 +49,7 @@ class ItemsTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->layout = $this->objectManager->get(LayoutInterface::class);
@@ -61,7 +61,7 @@ protected function setUp()
     /**
      * @inheritdoc
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->registry->unregister('current_order');
 

dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/lib/internal/Magento/Framework/Test/Unit/View/Element/UiComponentFactoryTest.php

@@ -32,7 +32,7 @@ class UiComponentFactoryTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Ui\Config\Reader\Definition\Data|MockObject */
     protected $dataMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
             ->getMockForAbstractClass();