fix merge

This commit is contained in:
Nicolas Grekas 2017-07-18 10:09:42 +02:00
parent 72aaecc0ff
commit 4917b30718

View File

@ -1605,10 +1605,6 @@ EOF;
} elseif (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) {
$code = sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id);
} else {
if ($this->container->hasAlias($id)) {
$id = (string) $this->container->getAlias($id);
}
$code = sprintf('$this->get(\'%s\')', $id);
}