From ca618fd94d71c7eac9ec44adadda17caf64e4c72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20L=C3=A9v=C3=AAque?= <benjamin@leveque.me>
Date: Mon, 2 Nov 2015 14:14:27 +0100
Subject: [PATCH 1/4] allow installation on symfony3

---
 .gitignore    | 2 ++
 composer.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 .gitignore

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/composer.json b/composer.json
index 056c640..2857ed2 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "symfony/framework-bundle": "~2.1",
-        "symfony/twig-bundle": "~2.0",
+        "symfony/twig-bundle": "~2.0|~3.0",
         "twig/twig": "~1.12"
     },
     "autoload": {

From a6f363bb0a0fcbb12825292f35fb18671353ac5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20L=C3=A9v=C3=AAque?= <benjamin@leveque.me>
Date: Mon, 2 Nov 2015 14:27:00 +0100
Subject: [PATCH 2/4] remove the scope in the container collector

---
 DataCollector/ContainerDataCollector.php      | 2 +-
 Resources/views/Collector/container.html.twig | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

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/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 @@
         <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 }}

From 1a6de162cdde5a0588fd26b865f1af7840c48227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20L=C3=A9v=C3=AAque?= <benjamin@leveque.me>
Date: Tue, 10 Nov 2015 13:24:38 +0100
Subject: [PATCH 3/4] add missing deps

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2857ed2..ccc268e 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "symfony/framework-bundle": "~2.1",
+        "symfony/framework-bundle": "~2.1|~3.0",
         "symfony/twig-bundle": "~2.0|~3.0",
         "twig/twig": "~1.12"
     },

From ba91739a3c1f2555db215ef75d101a1a0a0d365a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20L=C3=A9v=C3=AAque?= <benjamin@leveque.me>
Date: Mon, 21 Dec 2015 16:20:50 +0100
Subject: [PATCH 4/4] disable assetic by default as it is removed from symfony3

---
 DependencyInjection/Configuration.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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')