Sync with latest changes for composer autoloader finder

Author: natepage

src/DependencyInjection/MakerExtension.php

@@ -40,17 +40,6 @@ public function load(array $configs, ContainerBuilder $container)
         $namespacesHelperDefinition = $container->getDefinition('maker.namespaces_helper');
         $namespacesHelperDefinition->replaceArgument(0, $config);
 
-        $rootNamespace = trim($config['root_namespace'], '\\');
-
-        $autoloaderFinderDefinition = $container->getDefinition('maker.autoloader_finder');
-        $autoloaderFinderDefinition->replaceArgument(0, $rootNamespace);
-
-        $makeCommandDefinition = $container->getDefinition('maker.generator');
-        $makeCommandDefinition->replaceArgument(1, $rootNamespace);
-
-        $doctrineHelperDefinition = $container->getDefinition('maker.doctrine_helper');
-        $doctrineHelperDefinition->replaceArgument(0, $rootNamespace.'\\Entity');
-
         $container->registerForAutoconfiguration(MakerInterface::class)
             ->addTag(MakeCommandRegistrationPass::MAKER_TAG);
     }

src/Resources/config/services.xml

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

src/Util/ComposerAutoloaderFinder.php

@@ -27,8 +27,10 @@ class ComposerAutoloaderFinder
      */
     private $classLoader = null;
 
-    public function __construct(string $rootNamespace)
+    public function __construct(NamespacesHelper $namespacesHelper)
     {
+        $rootNamespace = $namespacesHelper->getRootNamespace();
+
         $this->rootNamespace = [
             'psr0' => rtrim($rootNamespace, '\\'),
             'psr4' => rtrim($rootNamespace, '\\').'\\',

tests/Util/AutoloaderUtilTest.php

@@ -15,6 +15,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\MakerBundle\Util\AutoloaderUtil;
 use Symfony\Bundle\MakerBundle\Util\ComposerAutoloaderFinder;
+use Symfony\Bundle\MakerBundle\Util\NamespacesHelper;
 use Symfony\Component\Filesystem\Filesystem;
 
 class AutoloaderUtilTest extends TestCase
@@ -96,7 +97,7 @@ private function createComposerAutoloaderFinder(array $composerJsonParams = null
         /** @var \PHPUnit_Framework_MockObject_MockObject|ComposerAutoloaderFinder $finder */
         $finder = $this
             ->getMockBuilder(ComposerAutoloaderFinder::class)
-            ->setConstructorArgs(['App\\'])
+            ->setConstructorArgs([new NamespacesHelper([])])
             ->getMock();
 
         $finder

tests/Util/ComposerAutoloaderFinderTest.php

@@ -14,6 +14,7 @@
 use Composer\Autoload\ClassLoader;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\MakerBundle\Util\ComposerAutoloaderFinder;
+use Symfony\Bundle\MakerBundle\Util\NamespacesHelper;
 
 class ComposerAutoloaderFinderTest extends TestCase
 {
@@ -42,7 +43,7 @@ public function providerNamespaces(): \Generator
     public function testGetClassLoader($psr0, $psr4)
     {
         $this->setupAutoloadFunctions($psr0, $psr4);
-        $loader = (new ComposerAutoloaderFinder(static::$rootNamespace))->getClassLoader();
+        $loader = (new ComposerAutoloaderFinder($this->getNamespacesHelper()))->getClassLoader();
 
         $this->assertInstanceOf(ClassLoader::class, $loader, 'Wrong ClassLoader found');
     }
@@ -56,7 +57,12 @@ public function testGetClassLoaderWhenItIsEmpty()
         };
 
         // throws \Exception
-        (new ComposerAutoloaderFinder(static::$rootNamespace))->getClassLoader();
+        (new ComposerAutoloaderFinder($this->getNamespacesHelper()))->getClassLoader();
+    }
+
+    private function getNamespacesHelper(): NamespacesHelper
+    {
+        return new NamespacesHelper(['root_namespace' => static::$rootNamespace]);
     }
 
     /**