Merge pull request #3 from mleczakm/master

Fix support for symfony 4.0
pixers · Dec 8, 2017 · 043169d · 043169d
2 parents 9bf0204 + 8604708
commit 043169d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/DataCollector/QueryCollector.php b/DataCollector/QueryCollector.php
@@ -212,6 +212,14 @@ public function getName()
         return 'doctrine_profiler';
     }
 
+    /**
+     * @return void
+     */
+    public function reset()
+    {
+        $this->data = array();
+    }
+
     /**
      * Returns "internal" namespaces for query source selection
      *

diff --git a/composer.json b/composer.json
@@ -7,7 +7,8 @@
         "php": ">=5.4",
         "doctrine/orm": "~2.4",
         "doctrine/doctrine-bundle": "~1.2",
-        "symfony/framework-bundle": "~2.6 || ~3.0"
+        "symfony/framework-bundle": "~2.6 || ~3.0 || ~4.0",
+        "symfony/stopwatch": "~2.6 || ~3.0 || ~4.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0"