Merge pull request #10257 from magento-gl/Arrows-AC-14808-v3

AC-14808: PHPUnit 12: Upgrade

Author: glo71317

app/code/Magento/AdminNotification/Test/Unit/Block/Grid/Renderer/ActionsTest.php

@@ -39,13 +39,13 @@ protected function setUp(): void
         $escaperMock->expects($this->atLeastOnce())->method('escapeUrl')->willReturn('https://magento.com');
 
         /** @var AuthorizationInterface|MockObject $authorizationMock */
-        $authorizationMock = $this->getMockForAbstractClass(AuthorizationInterface::class);
+        $authorizationMock = $this->createMock(AuthorizationInterface::class);
         $authorizationMock->expects($this->atLeastOnce())
             ->method('isAllowed')
             ->willReturn(true);
 
         /** @var UrlInterface|MockObject $urlBuilder */
-        $urlBuilder = $this->getMockForAbstractClass(UrlInterface::class);
+        $urlBuilder = $this->createMock(UrlInterface::class);
         $urlBuilder->expects($this->once())->method('getUrl')->willReturn('http://magento.com');
 
         /** @var Context|MockObject $contextMock */

app/code/Magento/AdminNotification/Test/Unit/Block/Grid/Renderer/SeverityTest.php

@@ -16,11 +16,14 @@
 use Magento\Backend\Block\Context;
 use Magento\Backend\Block\Widget\Grid\Column;
 use Magento\Framework\DataObject;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class SeverityTest extends TestCase
 {
+    use MockCreationTrait;
+
     /**
      * System under Test
      *
@@ -44,10 +47,7 @@ protected function setUp(): void
     public function testShouldRenderSeverity() : void
     {
         /** @var Column|MockObject $columnMock */
-        $columnMock = $this->getMockBuilder(Column::class)
-            ->disableOriginalConstructor()
-            ->addMethods(['getIndex'])
-            ->getMock();
+        $columnMock = $this->createPartialMockWithReflection(Column::class, ['getIndex']);
         $columnMock->expects($this->exactly(5))->method('getIndex')->willReturn('index');
         $this->sut->setColumn($columnMock);
         $dataObject = new DataObject();

app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php

@@ -20,6 +20,7 @@
 use Magento\Framework\HTTP\Adapter\CurlFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\UrlInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -100,10 +101,7 @@ protected function setUp(): void
         $this->curlFactory = $this->createPartialMock(CurlFactory::class, ['create']);
         $this->curl = $this->createMock(Curl::class);
         $this->appState = $this->createPartialMock(State::class, []);
-        $this->inboxModel = $this->createPartialMock(Inbox::class, [
-            '__wakeup',
-            'parse'
-        ]);
+        $this->inboxModel = $this->createMock(Inbox::class);
         $this->backendConfig = $this->createPartialMock(
             ConfigInterface::class,
             [
@@ -126,7 +124,7 @@ protected function setUp(): void
         $this->deploymentConfig = $this->createMock(DeploymentConfig::class);
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->productMetadata = $this->createMock(ProductMetadata::class);
-        $this->urlBuilder = $this->getMockForAbstractClass(UrlInterface::class);
+        $this->urlBuilder = $this->createMock(UrlInterface::class);
 
         $this->feed = $this->objectManagerHelper->getObject(
             Feed::class,
@@ -148,8 +146,8 @@ protected function setUp(): void
      * @param string $curlRequest
      *
      * @return void
-     * @dataProvider checkUpdateDataProvider
      */
+    #[DataProvider('checkUpdateDataProvider')]
     public function testCheckUpdate(bool $callInbox, string $curlRequest): void
     {
         $mockName    = 'Test Product Name';

app/code/Magento/AdminNotification/Test/Unit/Model/NotificationServiceTest.php

@@ -14,11 +14,14 @@
 use Magento\AdminNotification\Model\InboxFactory;
 use Magento\AdminNotification\Model\NotificationService;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class NotificationServiceTest extends TestCase
 {
+    use MockCreationTrait;
+
     /**
      * Retrieve instance of notification service model
      *
@@ -30,15 +33,11 @@ protected function _getServiceInstanceForMarkAsReadTest($notificationId)
         /**
          * @var MockObject|InboxFactory $notificationFactory
          */
-        $notificationFactory = $this->createPartialMock(
-            InboxFactory::class,
-            ['create']
+        $notificationFactory = $this->createMock(InboxFactory::class);
+        $notification = $this->createPartialMockWithReflection(
+            Inbox::class,
+            ['load', 'getId', 'save', 'setData', 'setIsRead']
         );
-        $notification = $this->getMockBuilder(Inbox::class)
-            ->addMethods(['setIsRead'])
-            ->onlyMethods(['load', 'getId', 'save', 'setData', '__sleep', '__wakeup'])
-            ->disableOriginalConstructor()
-            ->getMock();
         $notification->expects($this->once())->method('load')->with($notificationId)->willReturnSelf();
         $notification->expects($this->once())->method('getId')->willReturn($notificationId);
 

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php

@@ -10,13 +10,17 @@
 use Magento\AdminNotification\Model\System\Message\CacheOutdated;
 use Magento\Framework\App\Cache\TypeListInterface;
 use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\UrlInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class CacheOutdatedTest extends TestCase
 {
+    use MockCreationTrait;
+
     /**
      * @var MockObject
      */
@@ -39,9 +43,9 @@ class CacheOutdatedTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->_authorizationMock = $this->getMockForAbstractClass(AuthorizationInterface::class);
-        $this->_urlInterfaceMock = $this->getMockForAbstractClass(UrlInterface::class);
-        $this->_cacheTypeListMock = $this->getMockForAbstractClass(TypeListInterface::class);
+        $this->_authorizationMock = $this->createMock(AuthorizationInterface::class);
+        $this->_urlInterfaceMock = $this->createMock(UrlInterface::class);
+        $this->_cacheTypeListMock = $this->createMock(TypeListInterface::class);
 
         $objectManagerHelper = new ObjectManager($this);
         $arguments = [
@@ -58,8 +62,8 @@ protected function setUp(): void
     /**
      * @param string $expectedSum
      * @param array $cacheTypes
-     * @dataProvider getIdentityDataProvider
      */
+    #[DataProvider('getIdentityDataProvider')]
     public function testGetIdentity($expectedSum, $types)
     {
         $cacheType = [];
@@ -77,9 +81,7 @@ public function testGetIdentity($expectedSum, $types)
 
     protected function getMockForStdClass($mockReturn)
     {
-        $cacheTypeMock = $this->getMockBuilder(\stdClass::class)->addMethods(['getCacheType'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $cacheTypeMock = $this->createPartialMockWithReflection(\stdClass::class, ['getCacheType']);
         $cacheTypeMock->method('getCacheType')->willReturn($mockReturn);
         return $cacheTypeMock;
     }
@@ -102,8 +104,8 @@ public static function getIdentityDataProvider()
      * @param bool $expected
      * @param bool $allowed
      * @param array $cacheTypes
-     * @dataProvider isDisplayedDataProvider
      */
+    #[DataProvider('isDisplayedDataProvider')]
     public function testIsDisplayed($expected, $allowed, $cacheTypes)
     {
         $cacheType1 = [];

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php

@@ -11,6 +11,7 @@
 use Magento\Framework\Notification\MessageInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\MediaStorage\Model\File\Storage\Flag;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -58,8 +59,8 @@ public function testGetText()
     /**
      * @param bool $expectedFirstRun
      * @param array $data
-     * @dataProvider isDisplayedDataProvider
      */
+    #[DataProvider('isDisplayedDataProvider')]
     public function testIsDisplayed($expectedFirstRun, $data)
     {
         $arguments = ['fileStorage' => $this->_fileStorage];

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php

@@ -13,6 +13,7 @@
 use Magento\Framework\HTTP\Adapter\Curl;
 use Magento\Framework\HTTP\Adapter\CurlFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -41,8 +42,8 @@ class SecurityTest extends TestCase
     protected function setUp(): void
     {
         //Prepare objects for constructor
-        $this->cacheMock = $this->getMockForAbstractClass(CacheInterface::class);
-        $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
+        $this->cacheMock = $this->createMock(CacheInterface::class);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
         $this->curlFactoryMock = $this->createPartialMock(
             CurlFactory::class,
             ['create']
@@ -66,8 +67,8 @@ protected function setUp(): void
      * @param $cached
      * @param $response
      * @return void
-     * @dataProvider isDisplayedDataProvider
      */
+    #[DataProvider('isDisplayedDataProvider')]
     public function testIsDisplayed($expectedResult, $cached, $response)
     {
         $this->cacheMock->method('load')->willReturn($cached);

app/code/Magento/AdminNotification/Test/Unit/Observer/PredispatchAdminActionControllerObserverTest.php

@@ -66,20 +66,20 @@ protected function setUp(): void
         $this->objectManager = new ObjectManager($this);
         $this->observerMock = $this->createMock(Observer::class);
 
-        $this->backendAuthSessionMock = $this->getMockBuilder(Session::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['isLoggedIn'])
-            ->getMock();
-
-        $this->feedMock = $this->getMockBuilder(Feed::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['checkUpdate'])
-            ->getMock();
-
-        $this->feedFactoryMock = $this->getMockBuilder(FeedFactory::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['create'])
-            ->getMock();
+        $this->backendAuthSessionMock = $this->createPartialMock(
+            Session::class,
+            ['isLoggedIn']
+        );
+
+        $this->feedMock = $this->createPartialMock(
+            Feed::class,
+            ['checkUpdate']
+        );
+
+        $this->feedFactoryMock = $this->createPartialMock(
+            FeedFactory::class,
+            ['create']
+        );
 
         $this->observer = $this->objectManager->getObject(
             PredispatchAdminActionControllerObserver::class,

app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php

@@ -13,6 +13,7 @@
 use Magento\Framework\Config\Data\ConfigData;
 use Magento\Framework\Setup\Option\TextConfigOption;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -56,13 +57,8 @@ protected function setUp(): void
         ];
 
         $this->objectManager = new ObjectManager($this);
-        $this->connectionValidatorMock = $this->getMockBuilder(ConnectionValidator::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->connectionValidatorMock = $this->createMock(ConnectionValidator::class);
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
 
         $this->model = $this->objectManager->getObject(
             ConfigOptionsList::class,
@@ -131,8 +127,8 @@ public function testGetOptions()
     /**
      * @param array $options
      * @param array $expectedConfigData
-     * @dataProvider getCreateConfigDataProvider
      */
+    #[DataProvider('getCreateConfigDataProvider')]
     public function testCreateConfig($options, $expectedConfigData)
     {
         $result = $this->model->createConfig($options, $this->deploymentConfigMock);

app/code/Magento/AsynchronousOperations/Test/Unit/Block/Adminhtml/Bulk/Details/BackButtonTest.php

@@ -26,7 +26,7 @@ class BackButtonTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->urlBuilderMock = $this->getMockForAbstractClass(UrlInterface::class);
+        $this->urlBuilderMock = $this->createMock(UrlInterface::class);
         $this->block = new BackButton(
             $this->urlBuilderMock
         );