diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7579f74 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +vendor +composer.lock diff --git a/DataCollector/ContainerDataCollector.php b/DataCollector/ContainerDataCollector.php index dd485ba..9367481 100644 --- a/DataCollector/ContainerDataCollector.php +++ b/DataCollector/ContainerDataCollector.php @@ -86,7 +86,7 @@ public function collect(Request $request, Response $response, \Exception $except $definition = $this->resolveServiceDefinition($serviceId); if ($definition instanceof Definition && $definition->isPublic()) { - $services[$serviceId] = array('class' => $definition->getClass(), 'scope' => $definition->getScope()); + $services[$serviceId] = array('class' => $definition->getClass()); } elseif ($definition instanceof Alias) { $services[$serviceId] = array('alias' => $definition); } else { diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 63a656f..90ad021 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -44,8 +44,8 @@ public function getConfigTreeBuilder() ->arrayNode('assetic') ->addDefaultsIfNotSet() ->children() - ->booleanNode('enabled')->defaultTrue()->end() - ->booleanNode('display_in_wdt')->defaultTrue()->end() + ->booleanNode('enabled')->defaultFalse()->end() + ->booleanNode('display_in_wdt')->defaultFalse()->end() ->end() ->end() ->arrayNode('twig') diff --git a/Resources/views/Collector/container.html.twig b/Resources/views/Collector/container.html.twig index 18ec7f1..f5f229b 100644 --- a/Resources/views/Collector/container.html.twig +++ b/Resources/views/Collector/container.html.twig @@ -61,19 +61,11 @@ - {% for service_id, service in collector.services %} -
NameScope Class Name
{{ service_id }} - {% if service.scope is defined %} - {{ service.scope }} - {% else %} - N/A - {% endif %} - {% if service.class is defined %} {{ service.class }} diff --git a/composer.json b/composer.json index 056c640..ccc268e 100644 --- a/composer.json +++ b/composer.json @@ -16,8 +16,8 @@ } ], "require": { - "symfony/framework-bundle": "~2.1", - "symfony/twig-bundle": "~2.0", + "symfony/framework-bundle": "~2.1|~3.0", + "symfony/twig-bundle": "~2.0|~3.0", "twig/twig": "~1.12" }, "autoload": {