Merge remote-tracking branch '37629-v1/cleanup-non-existing-classes-from-unit-tests' into comm_247beta3

Author: Indrani sonawane

lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ExcludeFilterTest.php

@@ -32,6 +32,7 @@ public function testExclusion()
             ]
         );
 
+        $result = [];
         foreach ($iterator as $i) {
             $result[] = $i;
         }
@@ -52,8 +53,8 @@ private function getFilesIterator()
 
         foreach ($files as $file) {
             $item = $this->getMockBuilder(
-                \SplFileInfoClass::class
-            )->setMethods(['__toString', 'getFilename'])->getMock();
+                \SplFileInfo::class
+            )->disableOriginalConstructor()->setMethods(['__toString', 'getFilename'])->getMock();
             $item->expects($this->any())->method('__toString')->willReturn($file);
             $item->expects($this->any())->method('getFilename')->willReturn('notDots');
             yield $item;

lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/CompiledTest.php

@@ -299,14 +299,12 @@ private function getSimpleNestedConfig()
                 '_vac_' => [
                     'array_value' => 'value',
                     'array_configured_instance' => [
-                        '_i_' => \Magento\Framework\ObjectManager\Test\Unit::class
-                            . '\Factory\Fixture\Compiled\DependencySharedTesting',
+                        '_i_' => DependencySharedTesting::class,
                     ],
                     'array_configured_array' => [
                         'array_array_value' => 'value',
                         'array_array_configured_instance' => [
-                            '_ins_' => \Magento\Framework\ObjectManager::class
-                                . '\Test\Unit\Factory\Fixture\Compiled\DependencyTesting',
+                            '_ins_' => DependencyTesting::class,
                         ],
                     ],
                     'array_global_argument' => [

lib/internal/Magento/Framework/ObjectManager/Test/Unit/Helper/SortItemsTest.php

@@ -12,11 +12,6 @@
 
 class SortItemsTest extends TestCase
 {
-    /**
-     * @var MockObject|InterpreterInterface
-     */
-    protected InterpreterInterface $_itemInterpreter;
-
     /**
      * @var SortItemsHelper
      */

lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php

@@ -74,11 +74,8 @@ protected function setUp(): void
         $scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $cacheState = $this->getMockBuilder(StateInterface::class)
             ->getMockForAbstractClass();
-        $storeConfig = $this->getMockBuilder(\Magento\Store\Model\Store\Config::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->context = $this->getMockBuilder(Context::class)
-            ->setMethods(['getLayout', 'getEventManager', 'getStoreConfig', 'getScopeConfig', 'getCacheState'])
+            ->setMethods(['getLayout', 'getEventManager', 'getScopeConfig', 'getCacheState'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->context->expects($this->any())
@@ -87,9 +84,6 @@ protected function setUp(): void
         $this->context->expects($this->any())
             ->method('getEventManager')
             ->willReturn($eventManager);
-        $this->context->expects($this->any())
-            ->method('getStoreConfig')
-            ->willReturn($storeConfig);
         $this->context->expects($this->any())
             ->method('getScopeConfig')
             ->willReturn($scopeConfigMock);

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

@@ -12,6 +12,7 @@
  * Helper class for basic object retrieving, such as blocks, models etc...
  *
  * @deprecated Class under test should be instantiated with `new` keyword with explicit dependencies declaration
+ * @see https://github.com/magento/magento2/pull/29272
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ObjectManager
@@ -29,8 +30,6 @@ class ObjectManager
     ];
 
     /**
-     * Test object
-     *
      * @var \PHPUnit\Framework\TestCase
      */
     protected $_testObject;
@@ -158,10 +157,7 @@ protected function _getMockWithoutConstructorCall($className)
      */
     public function getObject($className, array $arguments = [])
     {
-        // phpstan:ignore
-        if (is_subclass_of($className, \Magento\Framework\Api\AbstractSimpleObjectBuilder::class)
-            || is_subclass_of($className, \Magento\Framework\Api\Builder::class)
-        ) {
+        if (is_subclass_of($className, \Magento\Framework\Api\AbstractSimpleObjectBuilder::class)) {
             return $this->getBuilder($className, $arguments);
         }
         $constructArguments = $this->getConstructArguments($className, $arguments);

lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/DeserializerFactoryTest.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * Test Webapi Json Deserializer Request Rest Controller.
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -62,7 +60,7 @@ public function testGetLogicExceptionInvalidRequestDeserializer()
     {
         $expectedMetadata = ['text_xml' => ['type' => 'text/xml', 'model' => 'Xml']];
         $invalidInterpreter = $this->getMockBuilder(
-            \Magento\Framework\Webapi\Response\Rest\Renderer\Json::class
+            \Magento\Framework\Webapi\Rest\Response\Renderer\Json::class
         )->disableOriginalConstructor()
         ->getMock();