namespace Symfony\Component\DependencyInjection\Dumper;
+use Symfony\Component\DependencyInjection\Argument\ArgumentInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
-use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\Parameter;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
-use Symfony\Component\DependencyInjection\Scope;
+use Symfony\Component\DependencyInjection\Reference;
/**
* GraphvizDumper dumps a service container as a graphviz file.
* * node.definition: The default options for services that are defined via service definition instances
* * node.missing: The default options for missing services
*
- * @param array $options An array of options
- *
* @return string The dot representation of the service container
*/
public function dump(array $options = array())
}
}
- return $this->startDot().$this->addNodes().$this->addEdges().$this->endDot();
+ return $this->container->resolveEnvPlaceholders($this->startDot().$this->addNodes().$this->addEdges().$this->endDot(), '__ENV_%s__');
}
/**
$code = '';
foreach ($this->edges as $id => $edges) {
foreach ($edges as $edge) {
- $code .= sprintf(" node_%s -> node_%s [label=\"%s\" style=\"%s\"];\n", $this->dotize($id), $this->dotize($edge['to']), $edge['name'], $edge['required'] ? 'filled' : 'dashed');
+ $code .= sprintf(" node_%s -> node_%s [label=\"%s\" style=\"%s\"%s];\n", $this->dotize($id), $this->dotize($edge['to']), $edge['name'], $edge['required'] ? 'filled' : 'dashed', $edge['lazy'] ? ' color="#9999ff"' : '');
}
}
*
* @return array An array of edges
*/
- private function findEdges($id, array $arguments, $required, $name)
+ private function findEdges($id, array $arguments, $required, $name, $lazy = false)
{
$edges = array();
foreach ($arguments as $argument) {
if ($argument instanceof Parameter) {
$argument = $this->container->hasParameter($argument) ? $this->container->getParameter($argument) : null;
- } elseif (is_string($argument) && preg_match('/^%([^%]+)%$/', $argument, $match)) {
+ } elseif (\is_string($argument) && preg_match('/^%([^%]+)%$/', $argument, $match)) {
$argument = $this->container->hasParameter($match[1]) ? $this->container->getParameter($match[1]) : null;
}
if ($argument instanceof Reference) {
+ $lazyEdge = $lazy;
+
if (!$this->container->has((string) $argument)) {
$this->nodes[(string) $argument] = array('name' => $name, 'required' => $required, 'class' => '', 'attributes' => $this->options['node.missing']);
+ } elseif ('service_container' !== (string) $argument) {
+ $lazyEdge = $lazy || $this->container->getDefinition((string) $argument)->isLazy();
}
- $edges[] = array('name' => $name, 'required' => $required, 'to' => $argument);
- } elseif (is_array($argument)) {
- $edges = array_merge($edges, $this->findEdges($id, $argument, $required, $name));
+ $edges[] = array('name' => $name, 'required' => $required, 'to' => $argument, 'lazy' => $lazyEdge);
+ } elseif ($argument instanceof ArgumentInterface) {
+ $edges = array_merge($edges, $this->findEdges($id, $argument->getValues(), $required, $name, true));
+ } elseif (\is_array($argument)) {
+ $edges = array_merge($edges, $this->findEdges($id, $argument, $required, $name, $lazy));
}
}
} catch (ParameterNotFoundException $e) {
}
- $nodes[$id] = array('class' => str_replace('\\', '\\\\', $class), 'attributes' => array_merge($this->options['node.definition'], array('style' => $definition->isShared() && ContainerInterface::SCOPE_PROTOTYPE !== $definition->getScope(false) ? 'filled' : 'dotted')));
+ $nodes[$id] = array('class' => str_replace('\\', '\\\\', $class), 'attributes' => array_merge($this->options['node.definition'], array('style' => $definition->isShared() ? 'filled' : 'dotted')));
$container->setDefinition($id, new Definition('stdClass'));
}
foreach ($container->getServiceIds() as $id) {
- $service = $container->get($id);
-
if (array_key_exists($id, $container->getAliases())) {
continue;
}
if (!$container->hasDefinition($id)) {
- $class = ('service_container' === $id) ? get_class($this->container) : get_class($service);
- $nodes[$id] = array('class' => str_replace('\\', '\\\\', $class), 'attributes' => $this->options['node.instance']);
+ $nodes[$id] = array('class' => str_replace('\\', '\\\\', \get_class($container->get($id))), 'attributes' => $this->options['node.instance']);
}
}
$container->setDefinitions($this->container->getDefinitions());
$container->setAliases($this->container->getAliases());
$container->setResources($this->container->getResources());
- foreach ($this->container->getScopes(false) as $scope => $parentScope) {
- $container->addScope(new Scope($scope, $parentScope));
- }
foreach ($this->container->getExtensions() as $extension) {
$container->registerExtension($extension);
}