[DI] Friendlier name for generated container in "as_files" mode

Author: nicolas-grekas

src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

@@ -188,31 +188,31 @@ public function dump(array $options = array())
             foreach ($this->generateProxyClasses() as $file => $c) {
                 $files[$file] = "<?php\n".$c;
             }
-            $files['Container.php'] = $code;
+            $files[$options['class'].'.php'] = $code;
             $hash = ucfirst(strtr(ContainerBuilder::hash($files), '._', 'xx'));
             $code = array();
 
             foreach ($files as $file => $c) {
                 $code["Container{$hash}/{$file}"] = $c;
             }
             array_pop($code);
-            $code["Container{$hash}/Container.php"] = implode("\nclass Container{$hash}", explode("\nclass {$options['class']}", $files['Container.php'], 2));
+            $code["Container{$hash}/{$options['class']}.php"] = substr_replace($files[$options['class'].'.php'], "<?php\n\nnamespace Container{$hash};\n", 0, 6);
             $namespaceLine = $this->namespace ? "\nnamespace {$this->namespace};\n" : '';
 
             $code[$options['class'].'.php'] = <<<EOF
 <?php
 {$namespaceLine}
 // This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
 
-if (!class_exists(Container{$hash}::class, false)) {
-    require __DIR__.'/Container{$hash}/Container.php';
+if (!class_exists(\\Container{$hash}\\{$options['class']}::class, false)) {
+    require __DIR__.'/Container{$hash}/{$options['class']}.php';
 }
 
 if (!class_exists({$options['class']}::class, false)) {
-    class_alias(Container{$hash}::class, {$options['class']}::class, false);
+    class_alias(\\Container{$hash}\\{$options['class']}::class, {$options['class']}::class, false);
 }
 
-return new Container{$hash}();
+return new \\Container{$hash}\\{$options['class']}();
 
 EOF;
         } else {
@@ -908,7 +908,7 @@ private function addNewInstance(Definition $definition, $return, $instantiation,
     private function startClass($class, $baseClass)
     {
         $bagClass = $this->container->isCompiled() ? 'use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;' : 'use Symfony\Component\DependencyInjection\ParameterBag\\ParameterBag;';
-        $namespaceLine = $this->namespace ? "\nnamespace {$this->namespace};\n" : '';
+        $namespaceLine = !$this->asFiles && $this->namespace ? "\nnamespace {$this->namespace};\n" : '';
 
         $code = <<<EOF
 <?php

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt

@@ -276,7 +276,9 @@ use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
 
 return $this->services['tagged_iterator_foo'] = new \Bar();
 
-    [Container%s/Container.php] => <?php
+    [Container%s/ProjectServiceContainer.php] => <?php
+
+namespace Container%s;
 
 use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -292,7 +294,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
  *
  * @final since Symfony 3.3
  */
-class Container%s extends Container
+class ProjectServiceContainer extends Container
 {
     private $parameters;
     private $targetDirs = array();
@@ -495,14 +497,14 @@ class Container%s extends Container
 
 // This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
 
-if (!class_exists(Container%s::class, false)) {
-    require __DIR__.'/Container%s/Container.php';
+if (!class_exists(\Container%s\ProjectServiceContainer::class, false)) {
+    require __DIR__.'/Container%s/ProjectServiceContainer.php';
 }
 
 if (!class_exists(ProjectServiceContainer::class, false)) {
-    class_alias(Container%s::class, ProjectServiceContainer::class, false);
+    class_alias(\Container%s\ProjectServiceContainer::class, ProjectServiceContainer::class, false);
 }
 
-return new Container%s();
+return new \Container%s\ProjectServiceContainer();
 
 )