Merge pull request #10278 from magento-gl/Arrows-AC-14808-v4

Arrows-AC-14808 | PHPUnit 12 Upgrade

Author: glo71317

app/code/Magento/AdminAnalytics/Test/Unit/Condition/CanViewNotificationTest.php

@@ -13,6 +13,7 @@
 use Magento\Framework\App\CacheInterface;
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -35,11 +36,10 @@ class CanViewNotificationTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->cacheStorageMock = $this->getMockBuilder(CacheInterface::class)
-            ->getMockForAbstractClass();
+        $this->cacheStorageMock = $this->createMock(CacheInterface::class);
         $this->logMock = $this->createMock(Log::class);
         $this->viewerLoggerMock = $this->createMock(Logger::class);
-        $this->productMetadataMock = $this->getMockForAbstractClass(ProductMetadataInterface::class);
+        $this->productMetadataMock = $this->createMock(ProductMetadataInterface::class);
         $objectManager = new ObjectManager($this);
         $this->canViewNotification = $objectManager->getObject(
             CanViewNotification::class,
@@ -55,8 +55,8 @@ protected function setUp(): void
      * @param $expected
      * @param $cacheResponse
      * @param $logExists
-     * @dataProvider isVisibleProvider
      */
+    #[DataProvider('isVisibleProvider')]
     public function testIsVisibleLoadDataFromLog($expected, $cacheResponse, $logExists)
     {
         $this->cacheStorageMock->expects($this->once())

app/code/Magento/AdminAnalytics/Test/Unit/Controller/Adminhtml/Config/EnableAdminUsageTest.php

@@ -61,9 +61,7 @@ protected function setUp(): void
         $configFactory->method('create')
             ->willReturn($this->configMock);
 
-        $this->productMetadataMock = $this->getMockBuilder(ProductMetadataInterface::class)
-            ->onlyMethods(['getVersion'])
-            ->getMockForAbstractClass();
+        $this->productMetadataMock = $this->createMock(ProductMetadataInterface::class);
 
         $this->productMetadataMock->method('getVersion')
             ->willReturn(self::STUB_PRODUCT_VERSION);

app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php

@@ -15,10 +15,12 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
 use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use PHPUnit\Framework\TestCase;
 
 class AdditionalCommentTest extends TestCase
 {
+    use MockCreationTrait;
     /**
      * @var AdditionalComment
      */
@@ -41,10 +43,10 @@ class AdditionalCommentTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
-            ->addMethods(['getComment', 'getLabel'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->abstractElementMock = $this->createPartialMockWithReflection(
+            AbstractElement::class,
+            ['getComment', 'getLabel']
+        );
 
         $objectManager = new ObjectManager($this);
         $escaper = $objectManager->getObject(Escaper::class);

app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php

@@ -18,12 +18,14 @@
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 
 /**
  * Test class for \Magento\Analytics\Block\Adminhtml\System\Config\CollectionTimeLabel
  */
 class CollectionTimeLabelTest extends TestCase
 {
+    use MockCreationTrait;
     /**
      * @var CollectionTimeLabel
      */
@@ -59,11 +61,10 @@ class CollectionTimeLabelTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
-            ->addMethods(['getComment'])
-            ->onlyMethods(['getElementHtml'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->abstractElementMock = $this->createPartialMockWithReflection(
+            AbstractElement::class,
+            ['getComment', 'getElementHtml']
+        );
 
         $objectManager = new ObjectManager($this);
         $escaper = $objectManager->getObject(Escaper::class);
@@ -77,13 +78,10 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
         $this->formMock = $this->createMock(Form::class);
-        $this->timeZoneMock = $this->getMockForAbstractClass(TimezoneInterface::class);
+        $this->timeZoneMock = $this->createMock(TimezoneInterface::class);
         $this->contextMock->method('getLocaleDate')
             ->willReturn($this->timeZoneMock);
-        $this->localeResolverMock = $this->getMockBuilder(ResolverInterface::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['getLocale'])
-            ->getMockForAbstractClass();
+        $this->localeResolverMock = $this->createMock(ResolverInterface::class);
 
         $objects = [
             [

app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php

@@ -15,10 +15,12 @@
 use Magento\Framework\Escaper;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use PHPUnit\Framework\TestCase;
 
 class SubscriptionStatusLabelTest extends TestCase
 {
+    use MockCreationTrait;
     /**
      * @var SubscriptionStatusLabel
      */
@@ -48,11 +50,10 @@ protected function setUp(): void
     {
         $this->subscriptionStatusProviderMock = $this->createMock(SubscriptionStatusProvider::class);
         $this->contextMock = $this->createMock(Context::class);
-        $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
-            ->addMethods(['getComment'])
-            ->onlyMethods(['getElementHtml'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->abstractElementMock = $this->createPartialMockWithReflection(
+            AbstractElement::class,
+            ['getComment', 'getElementHtml']
+        );
 
         $objectManager = new ObjectManager($this);
         $escaper = $objectManager->getObject(Escaper::class);

app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php

@@ -12,12 +12,14 @@
 use Magento\Framework\Data\Form;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Framework\Escaper;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class VerticalTest extends TestCase
 {
+    use MockCreationTrait;
     /**
      * @var Vertical
      */
@@ -40,11 +42,10 @@ class VerticalTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
-            ->addMethods(['getComment', 'getLabel', 'getHint'])
-            ->onlyMethods(['getElementHtml'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->abstractElementMock = $this->createPartialMockWithReflection(
+            AbstractElement::class,
+            ['getComment', 'getLabel', 'getHint', 'getElementHtml']
+        );
 
         $objectManager = new ObjectManager($this);
         $escaper = $objectManager->getObject(Escaper::class);

app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/BIEssentials/SignUpTest.php

@@ -47,7 +47,7 @@ class SignUpTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->configMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
+        $this->configMock = $this->createMock(ScopeConfigInterface::class);
         $this->resultRedirectFactoryMock = $this->createMock(RedirectFactory::class);
         $this->redirectMock = $this->createMock(Redirect::class);
 

app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Reports/ShowTest.php

@@ -16,6 +16,7 @@
 use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -64,7 +65,7 @@ protected function setUp(): void
 
         $this->redirectMock = $this->createMock(Redirect::class);
 
-        $this->messageManagerMock = $this->getMockForAbstractClass(ManagerInterface::class);
+        $this->messageManagerMock = $this->createMock(ManagerInterface::class);
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
 
@@ -104,10 +105,9 @@ public function testExecute()
     }
 
     /**
-     * @dataProvider executeWithExceptionDataProvider
-     *
      * @param \Exception $exception
      */
+    #[DataProvider('executeWithExceptionDataProvider')]
     public function testExecuteWithException(\Exception $exception)
     {
         $this->resultFactoryMock

app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Subscription/RetryTest.php

@@ -16,6 +16,7 @@
 use Magento\Framework\Phrase;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class RetryTest extends TestCase
@@ -61,7 +62,7 @@ protected function setUp(): void
 
         $this->subscriptionHandlerMock = $this->createMock(SubscriptionHandler::class);
 
-        $this->messageManagerMock = $this->getMockForAbstractClass(ManagerInterface::class);
+        $this->messageManagerMock = $this->createMock(ManagerInterface::class);
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
 
@@ -102,11 +103,10 @@ public function testExecute()
     }
 
     /**
-     * @dataProvider executeExceptionsDataProvider
-     *
      * @param \Exception $exception
      * @param Phrase $message
      */
+    #[DataProvider('executeExceptionsDataProvider')]
     public function testExecuteWithException(\Exception $exception, Phrase $message)
     {
         $this->resultFactoryMock

app/code/Magento/Analytics/Test/Unit/Cron/CollectDataTest.php

@@ -12,6 +12,8 @@
 use Magento\Analytics\Model\SubscriptionStatusProvider;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\Attributes\DataProvider;
+
 use PHPUnit\Framework\TestCase;
 
 class CollectDataTest extends TestCase
@@ -42,7 +44,7 @@ class CollectDataTest extends TestCase
     protected function setUp(): void
     {
         $this->exportDataHandlerMock = $this->getMockBuilder(ExportDataHandlerInterface::class)
-            ->getMockForAbstractClass();
+            ->getMock();
 
         $this->subscriptionStatusMock = $this->createMock(SubscriptionStatusProvider::class);
 
@@ -60,8 +62,8 @@ protected function setUp(): void
     /**
      * @param string $status
      * @return void
-     * @dataProvider executeDataProvider
      */
+    #[DataProvider('executeDataProvider')]
     public function testExecute($status)
     {
         $this->subscriptionStatusMock