Merge pull request barryvdh#463 from Naminator/master

barryvdh · barryvdh · commit e84c2cb068ed · 2016-02-11T10:17:22.000+01:00
[L5] Fatal Error in Lumen 5.2.* Query Collector
diff --git a/src/DataCollector/QueryCollector.php b/src/DataCollector/QueryCollector.php
@@ -80,6 +80,17 @@ public function setExplainSource($enabled, $types)
      */
     public function addQuery($query, $bindings, $time, $connection)
     {
+        // If the query argument is an instance of QueryExecuted the rest of the
+        // arguments are probably wrong types and are going to crash
+        // the collector.
+        if ( $query instanceof \Illuminate\Database\Events\QueryExecuted )
+        {
+            $bindings = $query->bindings;
+            $time = $query->time;
+            $connection = $query->connection;
+            $query = $query->sql;
+        }
+        
         $explainResults = array();
         $time = $time / 1000;
         $endTime = microtime(true);
