[DI] Fix dumping with custom base class

nicolas-grekas · nicolas-grekas · commit 29ce7be1167c · 2017-11-13T18:28:57.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -114,7 +114,7 @@ public function dump(array $options = array())
         $this->inlinedRequires = array();
         $options = array_merge(array(
             'class' => 'ProjectServiceContainer',
-            'base_class' => 'Container',
+            'base_class' => null,
             'namespace' => '',
             'as_files' => false,
             'debug' => true,
@@ -126,7 +126,14 @@ public function dump(array $options = array())
         $this->asFiles = $options['as_files'];
         $this->hotPathTag = $options['hot_path_tag'];
         $this->inlineRequires = $this->container->hasParameter($options['inline_class_loader_parameter']) && $this->container->getParameter($options['inline_class_loader_parameter']);
-        $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'] ? '*' : '';
 
@@ -156,7 +163,7 @@ public function dump(array $options = array())
         }
 
         $code =
-            $this->startClass($options['class'], $options['base_class']).
+            $this->startClass($options['class'], $baseClass).
             $this->addServices().
             $this->addDefaultParametersMethod().
             $this->endClass()
