MC-34039: Merge 2.4-develop into 2.4-develop-php74

Author: fascinosum

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

@@ -39,7 +39,7 @@ protected function setUp(): void
             ->getMockForAbstractClass();
         $this->logMock = $this->createMock(Log::class);
         $this->viewerLoggerMock = $this->createMock(Logger::class);
-        $this->productMetadataMock = $this->createMock(ProductMetadataInterface::class);
+        $this->productMetadataMock = $this->getMockForAbstractClass(ProductMetadataInterface::class);
         $objectManager = new ObjectManager($this);
         $this->canViewNotification = $objectManager->getObject(
             CanViewNotification::class,

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

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

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

@@ -39,9 +39,9 @@ class CacheOutdatedTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->_authorizationMock = $this->createMock(AuthorizationInterface::class);
-        $this->_urlInterfaceMock = $this->createMock(UrlInterface::class);
-        $this->_cacheTypeListMock = $this->createMock(TypeListInterface::class);
+        $this->_authorizationMock = $this->getMockForAbstractClass(AuthorizationInterface::class);
+        $this->_urlInterfaceMock = $this->getMockForAbstractClass(UrlInterface::class);
+        $this->_cacheTypeListMock = $this->getMockForAbstractClass(TypeListInterface::class);
 
         $objectManagerHelper = new ObjectManager($this);
         $arguments = [

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

@@ -41,8 +41,8 @@ class SecurityTest extends TestCase
     protected function setUp(): void
     {
         //Prepare objects for constructor
-        $this->cacheMock = $this->createMock(CacheInterface::class);
-        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+        $this->cacheMock = $this->getMockForAbstractClass(CacheInterface::class);
+        $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $this->curlFactoryMock = $this->createPartialMock(
             CurlFactory::class,
             ['create']

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php

@@ -208,7 +208,7 @@ protected function setUp(): void
         $this->storeResolver = $this->createMock(
             StoreResolver::class
         );
-        $this->groupRepository = $this->createMock(GroupRepositoryInterface::class);
+        $this->groupRepository = $this->getMockForAbstractClass(GroupRepositoryInterface::class);
         $this->writer = $this->createPartialMock(
             AbstractAdapter::class,
             [

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php

@@ -330,7 +330,7 @@ public function testSaveAndReplaceAdvancedPricesAddRowErrorCall()
         ];
         $this->dataSourceModel->expects($this->at(0))->method('getNextBunch')->willReturn($testBunch);
         $this->advancedPricing->expects($this->once())->method('validateRow')->willReturn(false);
-        $this->advancedPricing->method('saveProductPrices')->will($this->returnSelf());
+        $this->advancedPricing->method('saveProductPrices')->willReturnSelf();
 
         $this->advancedPricing
             ->expects($this->once())
@@ -538,7 +538,7 @@ public function testSaveAndReplaceAdvancedPricesReplaceBehaviourInternalCalls()
                     AdvancedPricing::TABLE_TIER_PRICE
                 ]
             )
-            ->will($this->returnSelf());
+            ->willReturnSelf();
 
         $this->invokeMethod($this->advancedPricing, 'saveAndReplaceAdvancedPrices');
     }
@@ -567,7 +567,7 @@ public function testDeleteAdvancedPricingFormListSkuToDelete()
             ->method('deleteProductTierPrices')
             ->withConsecutive(
                 [$expectedSkuList, AdvancedPricing::TABLE_TIER_PRICE]
-            )->will($this->returnSelf());
+            )->willReturnSelf();
 
         $this->advancedPricing->deleteAdvancedPricing();
     }

app/code/Magento/AdvancedSearch/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php

@@ -93,7 +93,7 @@ protected function setUp(): void
             ->setMethods(['create'])
             ->getMock();
 
-        $this->clientMock = $this->createMock(ClientInterface::class);
+        $this->clientMock = $this->getMockForAbstractClass(ClientInterface::class);
 
         $this->resultJsonMock = $this->getMockBuilder(Json::class)
             ->disableOriginalConstructor()

app/code/Magento/AdvancedSearch/Test/Unit/Model/Client/ClientResolverTest.php

@@ -45,7 +45,7 @@ protected function setUp(): void
         $this->engineResolverMock = $this->getMockBuilder(EngineResolverInterface::class)
             ->getMockForAbstractClass();
 
-        $this->objectManager = $this->createMock(ObjectManagerInterface::class);
+        $this->objectManager = $this->getMockForAbstractClass(ObjectManagerInterface::class);
 
         $this->model = new ClientResolver(
             $this->objectManager,
@@ -60,11 +60,11 @@ public function testCreate(): void
         $this->engineResolverMock->expects($this->once())->method('getCurrentSearchEngine')
             ->willReturn('engineName');
 
-        $factoryMock = $this->createMock(ClientFactoryInterface::class);
+        $factoryMock = $this->getMockForAbstractClass(ClientFactoryInterface::class);
 
-        $clientMock = $this->createMock(ClientInterface::class);
+        $clientMock = $this->getMockForAbstractClass(ClientInterface::class);
 
-        $clientOptionsMock = $this->createMock(ClientOptionsInterface::class);
+        $clientOptionsMock = $this->getMockForAbstractClass(ClientOptionsInterface::class);
 
         $this->objectManager->expects($this->exactly(2))->method('create')
             ->withConsecutive(

app/code/Magento/AdvancedSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php

@@ -100,7 +100,7 @@ public function testAroundSave(
     ): void {
         $this->engineResolverMock->expects($this->once())
             ->method('getCurrentSearchEngine')
-            ->will($this->returnValue($searchEngine));
+            ->willReturn($searchEngine);
 
         $groupMock = $this->createPartialMock(
             CustomerGroupModel::class,
@@ -121,7 +121,7 @@ public function testAroundSave(
         $this->indexerRegistryMock->expects($this->exactly($invalidateCounter))
             ->method('get')
             ->with(FulltextIndexer::INDEXER_ID)
-            ->will($this->returnValue($this->indexerMock));
+            ->willReturn($this->indexerMock);
 
         $this->assertEquals(
             $this->subjectMock,

app/code/Magento/AdvancedSearch/Test/Unit/Model/Recommendations/DataProviderTest.php

@@ -77,7 +77,7 @@ class DataProviderTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+        $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $this->layerResolverMock = $this->getMockBuilder(Resolver::class)
             ->disableOriginalConstructor()
             ->setMethods(['get'])
@@ -123,7 +123,7 @@ public function testGetItemsWhenDisabledSearchRecommendations(): void
         $isEnabledSearchRecommendations = false;
 
         /** @var QueryInterface $queryInterfaceMock */
-        $queryInterfaceMock = $this->createMock(QueryInterface::class);
+        $queryInterfaceMock = $this->getMockForAbstractClass(QueryInterface::class);
 
         $this->scopeConfigMock->expects($this->any())
             ->method('isSetFlag')
@@ -147,7 +147,7 @@ public function testGetItemsWhenEnabledSearchRecommendations(): void
         $queryText = 'test';
 
         /** @var QueryInterface $queryInterfaceMock */
-        $queryInterfaceMock = $this->createMock(QueryInterface::class);
+        $queryInterfaceMock = $this->getMockForAbstractClass(QueryInterface::class);
         $queryInterfaceMock->expects($this->any())->method('getQueryText')->willReturn($queryText);
 
         $this->scopeConfigMock->expects($this->any())