Merge pull request barryvdh#433 from kwoodfriend/patch-1

barryvdh · barryvdh · commit 974fd16e328c · 2015-12-22T07:22:38.000+01:00
Fix for Laravel 5.2 event changes
diff --git a/src/LaravelDebugbar.php b/src/LaravelDebugbar.php
@@ -288,8 +288,20 @@ function ($level, $message, $context) use ($logger) {
 
             try {
                 $db->listen(
-                    function ($query, $bindings, $time, $connectionName) use ($db, $queryCollector) {
-                        $connection = $db->connection($connectionName);
+                    function ($query, $bindings = null, $time = null, $connectionName = null) use ($db, $queryCollector) {
+                        // Laravel 5.2 changed the way some core events worked. We must account for
+                        // the first argument being an "event object", where arguments are passed
+                        // via object properties, instead of individual arguments.
+                        if (version_compare($this->version, '5.2.0', '>=')) {
+                            $bindings = $query->bindings;
+                            $time = $query->time;
+                            $connection = $query->connection;
+
+                            $query = $query->sql;
+                        } else {
+                            $connection = $db->connection($connectionName);
+                        }
+
                         $queryCollector->addQuery((string) $query, $bindings, $time, $connection);
                     }
                 );
