[DI] Fix dumping with custom base class

nicolas-grekas · nicolas-grekas · commit c1797107369f · 2017-11-13T19:01:22.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -107,12 +107,18 @@ public function dump(array $options = array())
         $this->targetDirRegex = null;
         $options = array_merge(array(
             'class' => 'ProjectServiceContainer',
-            'base_class' => 'Container',
+            'base_class' => null,
             'namespace' => '',
             'debug' => true,
         ), $options);
 
-        $this->initializeMethodNamesMap($options['base_class']);
+        if (!$baseClass = $options['base_class']) {
+            $baseClass = 'Container';
+        } elseif (0 !== strpos($baseClass, '\\')) {
+            $baseClass = sprintf('%s\%s', $options['namespace'] ? '\\'.$options['namespace'] : '', $baseClass);
+        }
+
+        $this->initializeMethodNamesMap('Container' === $baseClass ? Container::class : $baseClass);
 
         $this->docStar = $options['debug'] ? '*' : '';
 
@@ -141,7 +147,7 @@ public function dump(array $options = array())
             }
         }
 
-        $code = $this->startClass($options['class'], $options['base_class'], $options['namespace']);
+        $code = $this->startClass($options['class'], $baseClass, $options['namespace']);
 
         if ($this->container->isCompiled()) {
             $code .= $this->addFrozenConstructor();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
@@ -16,7 +16,7 @@
  *
  * @final since Symfony 3.3
  */
-class Container extends AbstractContainer
+class Container extends \Symfony\Component\DependencyInjection\Dump\AbstractContainer
 {
     private $parameters;
     private $targetDirs = array();

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*`
`17`	`17`	`* @final since Symfony 3.3`
`18`	`18`	`*/`
`19`		`-class Container extends AbstractContainer`
	`19`	`+class Container extends \Symfony\Component\DependencyInjection\Dump\AbstractContainer`
`20`	`20`	`{`
`21`	`21`	`private $parameters;`
`22`	`22`	`private $targetDirs = array();`