Only return the autoloader when it contains the root namespace

Author: GwendolenLynch

src/DependencyInjection/MakerExtension.php

@@ -39,6 +39,9 @@ public function load(array $configs, ContainerBuilder $container)
 
         $rootNamespace = trim($config['root_namespace'], '\\');
 
+        $autoloaderFinderDefinition = $container->getDefinition('maker.autoloader_finder');
+        $autoloaderFinderDefinition->replaceArgument(0, $rootNamespace);
+
         $makeCommandDefinition = $container->getDefinition('maker.generator');
         $makeCommandDefinition->replaceArgument(1, $rootNamespace);
 

src/Resources/config/services.xml

@@ -13,7 +13,9 @@
                 <argument>%kernel.project_dir%</argument>
             </service>
 
-            <service id="maker.autoloader_finder" class="Symfony\Bundle\MakerBundle\Util\ComposerAutoloaderFinder" />
+            <service id="maker.autoloader_finder" class="Symfony\Bundle\MakerBundle\Util\ComposerAutoloaderFinder" >
+                <argument /> <!-- root namespace -->
+            </service>
 
             <service id="maker.autoloader_util" class="Symfony\Bundle\MakerBundle\Util\AutoloaderUtil">
                 <argument type="service" id="maker.autoloader_finder" />

src/Util/ComposerAutoloaderFinder.php

@@ -19,11 +19,21 @@
  */
 class ComposerAutoloaderFinder
 {
+    /**
+     * @var string
+     */
+    private $rootNamespace;
+
     /**
      * @var ClassLoader|null
      */
     private $classLoader = null;
 
+    public function __construct(string $rootNamespace = 'App\\')
+    {
+        $this->rootNamespace = rtrim($rootNamespace, '\\').'\\';
+    }
+
     public function getClassLoader(): ClassLoader
     {
         if (null === $this->classLoader) {
@@ -46,13 +56,15 @@ private function findComposerClassLoader()
 
         foreach ($autoloadFunctions as $autoloader) {
             if (\is_array($autoloader) && isset($autoloader[0]) && \is_object($autoloader[0])) {
-                if ($autoloader[0] instanceof ClassLoader) {
+                if ($autoloader[0] instanceof ClassLoader
+                    && isset($autoloader[0]->getPrefixesPsr4()[$this->rootNamespace])) {
                     return $autoloader[0];
                 }
 
                 if ($autoloader[0] instanceof DebugClassLoader
                     && \is_array($autoloader[0]->getClassLoader())
-                    && $autoloader[0]->getClassLoader()[0] instanceof ClassLoader) {
+                    && $autoloader[0]->getClassLoader()[0] instanceof ClassLoader
+                    && isset($autoloader[0]->getClassLoader()[0]->getPrefixesPsr4()[$this->rootNamespace])) {
                     return $autoloader[0]->getClassLoader()[0];
                 }
             }

tests/Maker/FunctionalTest.php

@@ -205,7 +205,7 @@ public function getCommandTests()
             ])
             ->addExtraDependencies('orm')
             ->setFixtureFilesPath(__DIR__.'/../fixtures/MakeFormForEntity')
-		];
+        ];
 
         yield 'form_for_non_entity_dto' => [MakerTestDetails::createTest(
             $this->getMakerInstance(MakeForm::class),

tests/Util/ComposerAutoloaderFinderTest.php

@@ -10,6 +10,8 @@ class ComposerAutoloaderFinderTest extends TestCase
 {
     public static $getSplAutoloadFunctions = 'spl_autoload_functions';
 
+    private static $rootNamespace = 'Symfony\\Bundle\\MakerBundle\\';
+
     /**
      * @after
      */
@@ -20,7 +22,7 @@ public function resetAutoloadFunction()
 
     public function testGetClassLoader()
     {
-        $loader = (new ComposerAutoloaderFinder())->getClassLoader();
+        $loader = (new ComposerAutoloaderFinder(static::$rootNamespace))->getClassLoader();
 
         $this->assertInstanceOf(ClassLoader::class, $loader, 'Wrong ClassLoader found');
     }
@@ -35,7 +37,7 @@ public function testGetClassLoaderWhenItIsEmpty()
         };
 
         // throws \Exception
-        (new ComposerAutoloaderFinder())->getClassLoader();
+        (new ComposerAutoloaderFinder(static::$rootNamespace))->getClassLoader();
     }
 }