Merge pull request pomm-project#44 from stood/feature-compatibility-p…

…hp7.4 upgrade DatabaseCollector for Php7
sismicfr · May 14, 2020 · d05ff69 · d05ff69
2 parents b335ba3 + 4050ac6
commit d05ff69
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -7,6 +7,7 @@
     "license":  "MIT",
     "authors":  [ { "name": "Grégoire HUBERT", "email": "[email protected]" }, { "name": "Jérôme MACIAS", "email": "[email protected]" } ],
     "require": {
+        "php": ">=7.1",
         "pomm-project/foundation": "~2.0",
         "symfony/http-foundation": "~2.5|~3.0|~4.0|~5.0",
         "symfony/http-kernel": "~2.5|~3.0|~4.0|~5.0",

diff --git a/sources/lib/DatabaseDataCollector.php b/sources/lib/DatabaseDataCollector.php
@@ -59,7 +59,7 @@ public function execute($name, $data, Session $session)
     {
         switch ($name) {
             case 'query:post':
-                $this->data['time'] += $data['time_ms'];
+                $this->data['time'] += (float) $data['time_ms'];
                 $data += array_pop($this->data['queries']);
                 /* fall-through */
             case 'query:pre':
@@ -87,7 +87,7 @@ private function watch($name)
     /**
      * {@inheritdoc}
      */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         if ($exception instanceof SqlException) {
             $this->data['exception'] = $exception->getMessage();