Fixed 506c1eb for Laravel 5.1 Support (barryvdh#648)

brokenpeace · Jun 8, 2017 · 17afbae · 17afbae
1 parent 1878ff7
commit 17afbae
Showing 1 changed file with 27 additions and 3 deletions.
diff --git a/src/LaravelDebugbar.php b/src/LaravelDebugbar.php
@@ -348,21 +348,45 @@ function ($query, $bindings = null, $time = null, $connectionName = null) use ($
                     \Illuminate\Database\Events\TransactionBeginning::class,
                     'connection.*.beganTransaction',
                 ], function ($transaction) use ($queryCollector) {
-                    $queryCollector->collectTransactionEvent('Begin Transaction', $transaction->connection);
+
+                    // 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($transaction instanceof \Illuminate\Database\Events\TransactionBeginning) {
+                        $connection = $transaction->connection;
+                    } else {
+                        $connection = $transaction;
+                    }
+
+                    $queryCollector->collectTransactionEvent('Begin Transaction', $connection);
                 });
 
                 $db->getEventDispatcher()->listen([
                     \Illuminate\Database\Events\TransactionCommitted::class,
                     'connection.*.committed',
                 ], function ($transaction) use ($queryCollector) {
-                    $queryCollector->collectTransactionEvent('Commit Transaction', $transaction->connection);
+
+                    if($transaction instanceof \Illuminate\Database\Events\TransactionCommitted) {
+                        $connection = $transaction->connection;
+                    } else {
+                        $connection = $transaction;
+                    }
+
+                    $queryCollector->collectTransactionEvent('Commit Transaction', $connection);
                 });
 
                 $db->getEventDispatcher()->listen([
                     \Illuminate\Database\Events\TransactionRolledBack::class,
                     'connection.*.rollingBack',
                 ], function ($transaction) use ($queryCollector) {
-                    $queryCollector->collectTransactionEvent('Rollback Transaction', $transaction->connection);
+
+                    if($transaction instanceof \Illuminate\Database\Events\TransactionRolledBack) {
+                        $connection = $transaction->connection;
+                    } else {
+                        $connection = $transaction;
+                    }
+
+                    $queryCollector->collectTransactionEvent('Rollback Transaction', $connection);
                 });
             } catch (\Exception $e) {
                 $this->addThrowable(