ACP2E-3712: address PR comments

Author: alzota

setup/src/Magento/Setup/Test/Unit/Model/UninstallCollectorTest.php

@@ -7,7 +7,6 @@
 
 namespace Magento\Setup\Test\Unit\Model;
 
-use Magento\Setup\Model\FunctionOverrides;
 use Magento\Setup\Model\UninstallCollector;
 
 // phpcs:disable PSR1.Classes.ClassDeclaration
@@ -31,7 +30,9 @@ class UninstallCollectorTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp(): void
     {
-        FunctionOverrides::enable();
+        require_once '_files/app/code/Magento/A/Setup/Uninstall.php';
+        require_once '_files/app/code/Magento/B/Setup/Uninstall.php';
+
         $objectManagerProvider = $this->createMock(\Magento\Setup\Model\ObjectManagerProvider::class);
         $objectManager =
             $this->getMockForAbstractClass(\Magento\Framework\ObjectManagerInterface::class, [], '', false);
@@ -50,8 +51,8 @@ protected function setUp(): void
         $this->result = $this->createMock(\Magento\Framework\DB\Select::class);
         $select->expects($this->once())->method('from')->willReturn($this->result);
 
-        $uninstallA = 'Uninstall Class A';
-        $uninstallB = 'Uninstall Class B';
+        $uninstallA = 'Magento\A\Setup\Uninstall';
+        $uninstallB = 'Magento\B\Setup\Uninstall';
         $objectManager->expects($this->any())
             ->method('create')
             ->willReturnMap(
@@ -75,7 +76,7 @@ public function testUninstallCollector()
             ->willReturn([['module' => 'Magento_A'], ['module' => 'Magento_B'], ['module' => 'Magento_C']]);
 
         $this->assertEquals(
-            ['Magento_A' => 'Uninstall Class A', 'Magento_B' => 'Uninstall Class B'],
+            ['Magento_A' => 'Magento\A\Setup\Uninstall', 'Magento_B' => 'Magento\B\Setup\Uninstall'],
             $this->collector->collectUninstall()
         );
     }
@@ -88,105 +89,10 @@ public function testUninstallCollectorWithInput()
             ->with($this->result)
             ->willReturn([['module' => 'Magento_A']]);
 
-        $this->assertEquals(['Magento_A' => 'Uninstall Class A'], $this->collector->collectUninstall(['Magento_A']));
+        $this->assertEquals(['Magento_A' => 'Magento\A\Setup\Uninstall'], $this->collector->collectUninstall(['Magento_A']));
     }
     public function tearDown(): void
     {
-        FunctionOverrides::disable();
         parent::tearDown();
     }
 }
-
-namespace Magento\Setup\Model;
-
-/**
- * This function overrides the native function for the purpose of testing
- *
- * @param string $obj
- * @param string $className
- * @return bool
- */
-function is_subclass_of($obj, $className)
-{
-    return FunctionOverrides::is_subclass_of($obj, $className);
-}
-
-/**
- * This function overrides the native function for the purpose of testing
- *
- * @param string $className
- * @return bool
- */
-function class_exists($className)
-{
-    return FunctionOverrides::class_exists($className);
-}
-
-/**
- * This class is used to override the native functions for the purpose of testing
- */
-class FunctionOverrides
-{
-    /**
-     * @var bool
-     */
-    private static bool $enabled = false;
-
-    /**
-     * Check if the function overrides are enabled
-     *
-     * @return void
-     */
-    public static function enable(): void
-    {
-        self::$enabled = true;
-    }
-
-    /**
-     * Check if the function overrides are disabled
-     *
-     * @return void
-     */
-    public static function disable(): void
-    {
-        self::$enabled = false;
-    }
-
-    /**
-     * Check if the object is a subclass of the given class name
-     *
-     * @param $obj
-     * @param $className
-     * @return bool
-     */
-    public static function is_subclass_of($obj, $className): bool
-    {
-        if (!self::$enabled) {
-            return \is_subclass_of($obj, $className);
-        }
-        if ($obj == 'Uninstall Class A' && $className == \Magento\Framework\Setup\UninstallInterface::class) {
-            return true;
-        }
-        if ($obj == 'Uninstall Class B' && $className == \Magento\Framework\Setup\UninstallInterface::class) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Check if the class exists of the given class name
-     *
-     * @param $className
-     * @return bool
-     */
-    public static function class_exists($className): bool
-    {
-        if (!self::$enabled) {
-            return \class_exists($className);
-        }
-        if ($className == 'Magento\A\Setup\Uninstall' || $className == 'Magento\B\Setup\Uninstall') {
-            return true;
-        }
-        return false;
-    }
-}

setup/src/Magento/Setup/Test/Unit/Model/_files/app/code/Magento/A/Setup/Uninstall.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+namespace Magento\A\Setup;
+
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+
+class Uninstall implements \Magento\Framework\Setup\UninstallInterface
+{
+
+    public function uninstall(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+    }
+}

setup/src/Magento/Setup/Test/Unit/Model/_files/app/code/Magento/B/Setup/Uninstall.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+namespace Magento\B\Setup;
+
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+
+class Uninstall implements \Magento\Framework\Setup\UninstallInterface
+{
+
+    public function uninstall(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    {
+    }
+}

setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/XmlScannerTest.php

@@ -82,18 +82,7 @@ public function testCollectEntities(): void
             });
 
         $actual = $this->model->collectEntities($this->testFiles);
-
-        $proxyElementExists = class_exists('Magento\SomeModule\Element\Proxy');
-        $proxyNestedElementExists = class_exists('Magento\SomeModule\NestedElement\Proxy');
-
-        if ($proxyElementExists || $proxyNestedElementExists) {
-            $expected = [];
-        } else {
-            $expected = [
-                'Magento\SomeModule\Element\Proxy',
-                'Magento\SomeModule\NestedElement\Proxy'
-            ];
-        }
+        $expected = [];
 
         $this->assertEquals($expected, $actual);
     }