From 34f1d17c0ad3fd67a92f04e21b05e6b8198a5b88 Mon Sep 17 00:00:00 2001
From: "Barry vd. Heuvel" <barry@fruitcake.nl>
Date: Fri, 9 Jan 2026 22:16:19 +0100
Subject: [PATCH 1/2] Use symfony-bridge

---
 composer.json                       | 1 +
 src/Controllers/AssetController.php | 2 +-
 src/LaravelDebugbar.php             | 2 +-
 src/ServiceProvider.php             | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 3330a3ba3..364fcde20 100644
--- a/composer.json
+++ b/composer.json
@@ -19,6 +19,7 @@
     "require": {
         "php": "^8.2",
         "php-debugbar/php-debugbar": "^3.0",
+        "php-debugbar/symfony-bridge": "^1.0",
         "illuminate/routing": "^10|^11|^12",
         "illuminate/session": "^10|^11|^12",
         "illuminate/support": "^10|^11|^12",
diff --git a/src/Controllers/AssetController.php b/src/Controllers/AssetController.php
index 67a9d9b22..2339aaeb0 100644
--- a/src/Controllers/AssetController.php
+++ b/src/Controllers/AssetController.php
@@ -5,7 +5,7 @@
 namespace Barryvdh\Debugbar\Controllers;
 
 use DebugBar\AssetHandler;
-use DebugBar\SymfonyHttpDriver;
+use DebugBar\Bridge\Symfony\SymfonyHttpDriver;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
diff --git a/src/LaravelDebugbar.php b/src/LaravelDebugbar.php
index 5a085ae83..d62362db7 100644
--- a/src/LaravelDebugbar.php
+++ b/src/LaravelDebugbar.php
@@ -40,7 +40,7 @@
 use DebugBar\HttpDriverInterface;
 use DebugBar\Storage\PdoStorage;
 use DebugBar\Storage\RedisStorage;
-use DebugBar\SymfonyHttpDriver;
+use DebugBar\Bridge\Symfony\SymfonyHttpDriver;
 use Exception;
 use Illuminate\Config\Repository;
 use Illuminate\Contracts\Foundation\Application;
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
index 4d206f74a..6a0c4836f 100644
--- a/src/ServiceProvider.php
+++ b/src/ServiceProvider.php
@@ -7,7 +7,7 @@
 use Barryvdh\Debugbar\Middleware\InjectDebugbar;
 use DebugBar\DataFormatter\DataFormatter;
 use DebugBar\DataFormatter\DataFormatterInterface;
-use DebugBar\SymfonyHttpDriver;
+use DebugBar\Bridge\Symfony\SymfonyHttpDriver;
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Routing\Router;
 use Illuminate\Session\SymfonySessionDecorator;

From 67cb88c9c67f91b8e93c49d3908c93ce21583abf Mon Sep 17 00:00:00 2001
From: "Barry vd. Heuvel" <barry@fruitcake.nl>
Date: Fri, 9 Jan 2026 22:37:14 +0100
Subject: [PATCH 2/2] Fix gate test

---
 src/DataCollector/GateCollector.php       |  3 +--
 tests/DataCollector/GateCollectorTest.php | 30 +++++++++++------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/DataCollector/GateCollector.php b/src/DataCollector/GateCollector.php
index bc86d5629..9ab6f2cba 100644
--- a/src/DataCollector/GateCollector.php
+++ b/src/DataCollector/GateCollector.php
@@ -5,7 +5,6 @@
 namespace Barryvdh\Debugbar\DataCollector;
 
 use DebugBar\DataCollector\MessagesCollector;
-use DebugBar\DataFormatter\SimpleFormatter;
 use Illuminate\Auth\Access\Response;
 use Illuminate\Contracts\Auth\Access\Gate;
 use Illuminate\Contracts\Auth\Authenticatable;
@@ -26,7 +25,6 @@ public function __construct(Gate $gate, Router $router)
     {
         parent::__construct('gate');
         $this->router = $router;
-        $this->setDataFormatter(new SimpleFormatter());
         $gate->after(function ($user, $ability, $result, $arguments = []) {
             $this->addCheck($user, $ability, $result, $arguments);
         });
@@ -57,6 +55,7 @@ public function addCheck(mixed $user, string $ability, mixed $result, array $arg
                 } else {
                     $target = get_class($model);
                 }
+                $arguments[0] = $target;
             } elseif (is_string($arguments[0])) {
                 $target = $arguments[0];
             }
diff --git a/tests/DataCollector/GateCollectorTest.php b/tests/DataCollector/GateCollectorTest.php
index 49f436ae2..30f6a259f 100644
--- a/tests/DataCollector/GateCollectorTest.php
+++ b/tests/DataCollector/GateCollectorTest.php
@@ -43,16 +43,16 @@ public function testItCollectsGateChecks()
             $gateError['message'],
         );
         $this->assertEquals(
-            $gateError['context'],
             [
-                'ability' => 'view',
-                'target' => 'Barryvdh\Debugbar\Tests\Models\User(id=1)',
-                'result' => null,
-                'user' => 1,
-                'arguments' => [
-                    $user,
-                ],
+                'ability' => '"view"',
+                'target' => '"Barryvdh\Debugbar\Tests\Models\User(id=1)"',
+                'result' => 'null',
+                'user' => '1',
+                'arguments' => 'array:1 [
+  0 => "Barryvdh\Debugbar\Tests\Models\User(id=1)"
+]',
             ],
+            $gateError['context']
         );
 
         $gateSuccess = $collect['messages'][1];
@@ -64,13 +64,13 @@ public function testItCollectsGateChecks()
         $this->assertEquals(
             $gateSuccess['context'],
             [
-                'ability' => 'view',
-                'target' => 'Barryvdh\Debugbar\Tests\Models\User(id=1)',
-                'result' => true,
-                'user' => 1,
-                'arguments' => [
-                    $user,
-                ],
+                'ability' => '"view"',
+                'target' => '"Barryvdh\Debugbar\Tests\Models\User(id=1)"',
+                'result' => 'true',
+                'user' => '1',
+                'arguments' => 'array:1 [
+  0 => "Barryvdh\Debugbar\Tests\Models\User(id=1)"
+]',
             ],
         );
     }