[DI] Register PSR4 prototypes as definitions

Robin Chalas · Robin Chalas · commit 33cc5234f3af · 2017-07-17T15:14:23.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\Loader;
 
+use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -58,12 +59,14 @@ public function registerClasses(Definition $prototype, $namespace, $resource, $e
             throw new InvalidArgumentException(sprintf('Namespace is not a valid PSR-4 prefix: %s.', $namespace));
         }
 
+        $public = $prototype->isPublic();
         $classes = $this->findClasses($namespace, $resource, $exclude);
         // prepare for deep cloning
         $prototype = serialize($prototype);
 
         foreach ($classes as $class) {
-            $this->setDefinition($class, unserialize($prototype));
+            $this->setDefinition("$class.prototype", unserialize($prototype)->setClass($class)->setPublic(false));
+            $this->container->setAlias($class, new Alias("$class.prototype", $public));
         }
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
@@ -88,9 +88,10 @@ public function testRegisterClasses()
         $loader->registerClasses(new Definition(), 'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\\', 'Prototype/%sub_dir%/*');
 
         $this->assertEquals(
-            array('service_container', Bar::class),
+            array('service_container', Bar::class.'.prototype'),
             array_keys($container->getDefinitions())
         );
+        $this->assertSame(Bar::class.'.prototype', (string) $container->getAlias(Bar::class));
     }
 
     public function testRegisterClassesWithExclude()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -624,8 +624,9 @@ public function testPrototype()
 
         $ids = array_keys($container->getDefinitions());
         sort($ids);
-        $this->assertSame(array(Prototype\Foo::class, Prototype\Sub\Bar::class, 'service_container'), $ids);
-
+        $this->assertSame(array(Prototype\Foo::class.'.prototype', Prototype\Sub\Bar::class.'.prototype', 'service_container'), $ids);
+        $this->assertSame(Prototype\Foo::class.'.prototype', (string) $container->getAlias(Prototype\Foo::class));
+        $this->assertSame(Prototype\Sub\Bar::class.'.prototype', (string) $container->getAlias(Prototype\Sub\Bar::class));
         $resources = $container->getResources();
 
         $fixturesDir = dirname(__DIR__).DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -376,7 +376,9 @@ public function testPrototype()
 
         $ids = array_keys($container->getDefinitions());
         sort($ids);
-        $this->assertSame(array(Prototype\Foo::class, Prototype\Sub\Bar::class, 'service_container'), $ids);
+        $this->assertSame(array(Prototype\Foo::class.'.prototype', Prototype\Sub\Bar::class.'.prototype', 'service_container'), $ids);
+        $this->assertSame(Prototype\Foo::class.'.prototype', (string) $container->getAlias(Prototype\Foo::class));
+        $this->assertSame(Prototype\Sub\Bar::class.'.prototype', (string) $container->getAlias(Prototype\Sub\Bar::class));
 
         $resources = $container->getResources();
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\DependencyInjection\Loader;`
`13`	`13`
	`14`	`+use Symfony\Component\DependencyInjection\Alias;`
`14`	`15`	`use Symfony\Component\DependencyInjection\ChildDefinition;`
`15`	`16`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`16`	`17`	`use Symfony\Component\DependencyInjection\Definition;`
`@@ -58,12 +59,14 @@ public function registerClasses(Definition $prototype, $namespace, $resource, $e`
`58`	`59`	`throw new InvalidArgumentException(sprintf('Namespace is not a valid PSR-4 prefix: %s.', $namespace));`
`59`	`60`	`}`
`60`	`61`
	`62`	`+ $public = $prototype->isPublic();`
`61`	`63`	`$classes = $this->findClasses($namespace, $resource, $exclude);`
`62`	`64`	`// prepare for deep cloning`
`63`	`65`	`$prototype = serialize($prototype);`
`64`	`66`
`65`	`67`	`foreach ($classes as $class) {`
`66`		`- $this->setDefinition($class, unserialize($prototype));`
	`68`	`+ $this->setDefinition("$class.prototype", unserialize($prototype)->setClass($class)->setPublic(false));`
	`69`	`+ $this->container->setAlias($class, new Alias("$class.prototype", $public));`
`67`	`70`	`}`
`68`	`71`	`}`
`69`	`72`