diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DI] Fix dumping with custom base class

Browse Source
This commit is contained in:
Nicolas Grekas 2017-11-13 18:28:57 +01:00
parent a050ee251f
commit 2dd74ab89e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
View File

@ -112,7 +112,11 @@ class PhpDumper extends Dumper
'debug' => true, 'debug' => true,
), $options); ), $options);
$this->initializeMethodNamesMap($options['base_class']); if (0 !== strpos($baseClass = $options['base_class'], '\\') && 'Container' !== $baseClass) {
$baseClass = sprintf('%s\%s', $options['namespace'] ? '\\'.$options['namespace'] : '', $baseClass);
}
$this->initializeMethodNamesMap('Container' === $baseClass ? Container::class : $baseClass);
$this->docStar = $options['debug'] ? '*' : ''; $this->docStar = $options['debug'] ? '*' : '';
@ -141,7 +145,7 @@ class PhpDumper extends Dumper
} }
} }
$code = $this->startClass($options['class'], $options['base_class'], $options['namespace']); $code = $this->startClass($options['class'], $baseClass, $options['namespace']);
if ($this->container->isCompiled()) { if ($this->container->isCompiled()) {
$code .= $this->addFrozenConstructor(); $code .= $this->addFrozenConstructor();

2
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
* *
* @final since Symfony 3.3 * @final since Symfony 3.3
*/ */
class Container extends AbstractContainer class Container extends \Symfony\Component\DependencyInjection\Dump\AbstractContainer
{ {
private $parameters; private $parameters;
private $targetDirs = array(); private $targetDirs = array();