#27500 Prepare GoogleAnalytics module Tests for PHPUnit 8

app/code/Magento/GoogleAnalytics/Test/Unit/Block/GaTest.php

@@ -1,11 +1,12 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Magento\GoogleAnalytics\Test\Unit\Block;
 
+use Magento\Cookie\Helper\Cookie;
 use Magento\Framework\Escaper;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\Template\Context;
@@ -15,47 +16,49 @@
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\ResourceModel\Order\Collection;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
+use Magento\Store\Api\Data\WebsiteInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class GaTest extends \PHPUnit\Framework\TestCase
+class GaTest extends TestCase
 {
 
     /**
-     * @var Ga | \PHPUnit_Framework_MockObject_MockObject
+     * @var Ga|MockObject
      */
     protected $gaBlock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $cookieHelperMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $salesOrderCollectionMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $storeManagerMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $storeMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     private $googleAnalyticsDataMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
         $contextMock = $this->getMockBuilder(Context::class)->disableOriginalConstructor()->getMock();
@@ -79,7 +82,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->cookieHelperMock = $this->getMockBuilder(\Magento\Cookie\Helper\Cookie::class)
+        $this->cookieHelperMock = $this->getMockBuilder(Cookie::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -135,7 +138,7 @@ public function testIsCookieRestrictionModeEnabled()
     public function testGetCurrentWebsiteId()
     {
         $websiteId = 100;
-        $websiteMock = $this->getMockBuilder(\Magento\Store\Api\Data\WebsiteInterface::class)->getMock();
+        $websiteMock = $this->getMockBuilder(WebsiteInterface::class)->getMock();
         $websiteMock->expects($this->once())->method('getId')->willReturn($websiteId);
         $this->storeManagerMock->expects($this->once())->method('getWebsite')->willReturn($websiteMock);
         $this->assertEquals($websiteId, $this->gaBlock->getCurrentWebsiteId());
@@ -185,15 +188,15 @@ public function testGetPageTrackingData()
         ];
         $this->gaBlock->setData('page_name', $pageName);
         $this->googleAnalyticsDataMock->expects($this->once())->method('isAnonymizedIpActive')->willReturn(true);
-        
+
         $this->assertEquals($expectedResult, $this->gaBlock->getPageTrackingData($accountId));
     }
 
     /**
      * Create Order mock with $orderItemCount items
      *
      * @param int $orderItemCount
-     * @return Order|\PHPUnit_Framework_MockObject_MockObject
+     * @return Order|MockObject
      */
     protected function createOrderMock($orderItemCount = 1)
     {
@@ -220,7 +223,7 @@ protected function createOrderMock($orderItemCount = 1)
     }
 
     /**
-     * @return Collection | \PHPUnit_Framework_MockObject_MockObject
+     * @return Collection|MockObject
      */
     protected function createCollectionMock()
     {

app/code/Magento/GoogleAnalytics/Test/Unit/Helper/DataTest.php

@@ -9,12 +9,12 @@
 
 namespace Magento\GoogleAnalytics\Test\Unit\Helper;
 
-use Magento\GoogleAnalytics\Helper\Data as HelperData;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use PHPUnit\Framework\TestCase;
+use Magento\GoogleAnalytics\Helper\Data as HelperData;
+use Magento\Store\Model\ScopeInterface;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Unit test for Magento\GoogleAnalytics\Helper\Data

app/code/Magento/GoogleAnalytics/Test/Unit/Observer/SetGoogleAnalyticsOnOrderSuccessPageViewObserverTest.php

@@ -15,32 +15,33 @@
 use Magento\GoogleAnalytics\Helper\Data as GaDataHelper;
 use Magento\GoogleAnalytics\Observer\SetGoogleAnalyticsOnOrderSuccessPageViewObserver;
 use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class SetGoogleAnalyticsOnOrderSuccessPageViewObserverTest extends TestCase
 {
     /**
-     * @var Event|\PHPUnit_Framework_MockObject_MockObject
+     * @var Event|MockObject
      */
     private $eventMock;
 
     /**
-     * @var Observer|\PHPUnit_Framework_MockObject_MockObject
+     * @var Observer|MockObject
      */
     private $observerMock;
 
     /**
-     * @var GaDataHelper|\PHPUnit_Framework_MockObject_MockObject
+     * @var GaDataHelper|MockObject
      */
     private $googleAnalyticsDataMock;
 
     /**
-     * @var LayoutInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var LayoutInterface|MockObject
      */
     private $layoutMock;
 
     /**
-     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StoreManagerInterface|MockObject
      */
     private $storeManagerMock;
 
@@ -52,7 +53,7 @@ class SetGoogleAnalyticsOnOrderSuccessPageViewObserverTest extends TestCase
     /**
      * Test setUp
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->googleAnalyticsDataMock = $this->getMockBuilder(GaDataHelper::class)
             ->disableOriginalConstructor()