Merge pull request #60 from magento-cia/cia-2.4.8-beta1-develop-2.4-develop-sync-08152024

Cia 2.4.8 beta1 develop 2.4 develop sync 08152024

Author: pawan-adobe-security

AdminAdobeIms/Test/Unit/Controller/Adminhtml/OAuth/ImsCallbackTest.php

@@ -230,8 +230,10 @@ private function addMockData(): void
             ->with('form_key')
             ->willReturnSelf();
         $this->requestMock->expects($this->any())->method('getParam')
-            ->withConsecutive(['state'], ['locale'])
-            ->willReturnOnConsecutiveCalls('abc', 'en');
+            ->willReturnCallback(fn($param) => match ([$param]) {
+                ['state'] => 'abc',
+                ['locale'] => 'en'
+            });
         $this->authSessionMock->expects($this->any())->method('setIsUrlNotice')
             ->willReturnSelf();
         $this->authSessionMock->expects($this->any())->method('getLocale')
@@ -246,7 +248,9 @@ private function addMockData(): void
         $this->authMock->expects($this->any())->method('isLoggedIn')->willReturn(false);
         $this->objectManagerMock
             ->method('get')
-            ->withConsecutive([Locale::class], [\Magento\Backend\Model\Locale\Manager::class])
-            ->willReturnOnConsecutiveCalls($this->localeMock, $this->managerMock);
+            ->willReturnCallback(fn($param) => match ([$param]) {
+                [Locale::class] => $this->localeMock,
+                [\Magento\Backend\Model\Locale\Manager::class] => $this->managerMock
+            });
     }
 }

AdminAdobeIms/Test/Unit/Controller/Adminhtml/OAuth/ImsReauthCallbackTest.php

@@ -121,8 +121,10 @@ private function setMockData(): void
             ->with('form_key')
             ->willReturnSelf();
         $this->request->expects($this->any())->method('getParam')
-            ->withConsecutive(['state'], ['code'])
-            ->willReturnOnConsecutiveCalls(null, 'asdasdasdad');
+            ->willReturnCallback(fn($param) => match ([$param]) {
+                ['state'] => null,
+                ['code'] => 'asdasdasdad'
+            });
         $this->resultFactory->expects($this->once())
             ->method('create')
             ->with(ResultFactory::TYPE_RAW)

AdminAdobeIms/Test/Unit/Model/ImsWebapiRepositoryTest.php

@@ -90,7 +90,7 @@ protected function setUp(): void
         $this->loggerMock = $this->createMock(LoggerInterface::class);
         $this->entityCollectionFactory = $this->getMockBuilder(CollectionFactory::class)
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->getMock();
 
         $this->collectionProcessor = $this->createMock(CollectionProcessorInterface::class);
@@ -191,7 +191,7 @@ protected function initCollection(): array
     {
         $collectionSize = 1;
         $searchCriteriaMock = $this->getMockBuilder(SearchCriteriaInterface::class)
-            ->setMethods(['getPageSize'])
+            ->onlyMethods(['getPageSize'])
             ->getMockForAbstractClass();
 
         $searchCriteriaMock->expects($this->any())

AdminAdobeIms/Test/Unit/Plugin/ReplaceVerifyIdentityWithImsPluginTest.php

@@ -55,7 +55,7 @@ protected function setUp(): void
         $objectManagerHelper = new ObjectManagerHelper($this);
 
         $this->storageMock = $this->getMockBuilder(StorageInterface::class)
-            ->setMethods(['getAdobeAccessToken', 'getAdobeReAuthToken', 'setAdobeReAuthToken'])
+            ->addMethods(['getAdobeAccessToken', 'getAdobeReAuthToken', 'setAdobeReAuthToken'])
             ->getMockForAbstractClass();
 
         $this->authMock = $this->getMockBuilder(Auth::class)