Merge remote-tracking branch 'origin/AC-11633' into Hammer-247-delivery-21Mar24

Author: glo71317

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php

@@ -184,7 +184,7 @@ protected function setUp(): void
                 $this->customOptionFactoryMock
             ]
         ];
-        $this->prepareObjectManager($objects);
+        $this->objectManager->prepareObjectManager($objects);
 
         $this->helper = $this->objectManager->getObject(
             Helper::class,
@@ -772,22 +772,4 @@ private function assembleProductRepositoryMock($links)
             ->method('getById')
             ->willReturnMap($repositoryReturnMap);
     }
-
-    /**
-     * @param $map
-     */
-    private function prepareObjectManager($map)
-    {
-        $objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
-            ->addMethods(['getInstance'])
-            ->onlyMethods(['get'])
-            ->getMockForAbstractClass();
-
-        $objectManagerMock->method('getInstance')->willReturnSelf();
-        $objectManagerMock->method('get')->willReturnMap($map);
-
-        $reflectionProperty = new \ReflectionProperty(\Magento\Framework\App\ObjectManager::class, '_instance');
-        $reflectionProperty->setAccessible(true);
-        $reflectionProperty->setValue($objectManagerMock);
-    }
 }

dev/tests/static/framework/Magento/PhpStan/Formatters/FilteredErrorFormatter.php

@@ -76,7 +76,8 @@ public function formatErrors(AnalysisResult $analysisResult, Output $output): in
             $analysisResult->isDefaultLevelUsed(),
             $analysisResult->getProjectConfigFile(),
             $analysisResult->isResultCacheSaved(),
-            $analysisResult->getPeakMemoryUsageBytes()
+            $analysisResult->getPeakMemoryUsageBytes(),
+            $analysisResult->isResultCacheUsed()
         );
 
         return $this->tableErrorFormatter->formatErrors($clearedAnalysisResult, $output);

lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php

@@ -380,6 +380,6 @@ public function prepareObjectManager(array $map = [])
 
         $reflectionProperty = new \ReflectionProperty(AppObjectManager::class, '_instance');
         $reflectionProperty->setAccessible(true);
-        $reflectionProperty->setValue($objectManagerMock);
+        $reflectionProperty->setValue($objectManagerMock, $objectManagerMock);
     }
 }