Merge pull request #70 from Elao/symfony3

[wip] Allow this bundle to be installed with Symfony3
Elao · Dec 21, 2015 · 1b29496 · 1b29496
2 parents 31f686a + ba91739
commit 1b29496
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+vendor
+composer.lock
diff --git 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
@@ -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
@@ -61,19 +61,11 @@
         <table>
             <tr>
                 <th>Name</th>
-                <th>Scope</th>
                 <th>Class Name</th>
             </tr>
             {% for service_id, service in collector.services %}
                 <tr class="{{ loop.index is odd ? 'odd' : 'even' }}">
                     <th><code>{{ service_id }}</code></th>
-                    <td>
-                        {% if service.scope is defined %}
-                            {{ service.scope }}
-                        {% else %}
-                            N/A
-                        {% endif %}
-                    </td>
                     <td>
                         {% if service.class is defined %}
                             {{ service.class }}

diff --git 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": {