From 6c894651cb7b8f240f40cc3bd0412424e7d1e99e Mon Sep 17 00:00:00 2001
From: Bert van Hoekelen <bert@magwel.nl>
Date: Fri, 23 Oct 2020 12:49:27 +0200
Subject: [PATCH 1/2] Set correct connection on Dumper class

---
 src/DumpServerServiceProvider.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/DumpServerServiceProvider.php b/src/DumpServerServiceProvider.php
index 1349e65..0f28e14 100644
--- a/src/DumpServerServiceProvider.php
+++ b/src/DumpServerServiceProvider.php
@@ -49,11 +49,9 @@ public function register()
             'source' => new SourceContextProvider('utf-8', base_path()),
         ]);
 
-        $this->app->when(Dumper::class)->needs('$connection')->give($connection);
         $app = $this->app;
-
-        VarDumper::setHandler(function ($var) use ($app) {
-            $app->make(Dumper::class)->dump($var);
+        VarDumper::setHandler(function ($var) use ($app, $connection) {
+            $app->makeWith(Dumper::class, ['connection' => $connection])->dump($var);
         });
     }
 }

From eda9f9d400c8e58ea00998fe9ecdd6910514d0be Mon Sep 17 00:00:00 2001
From: Bert van Hoekelen <BertvanHoekelen@users.noreply.github.com>
Date: Tue, 27 Oct 2020 16:03:44 +0100
Subject: [PATCH 2/2] Apply suggestions from code review

Co-authored-by: Ilyes512 <ilyes.ahidar@gmail.com>
---
 src/DumpServerServiceProvider.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/DumpServerServiceProvider.php b/src/DumpServerServiceProvider.php
index 0f28e14..ae9b667 100644
--- a/src/DumpServerServiceProvider.php
+++ b/src/DumpServerServiceProvider.php
@@ -49,9 +49,8 @@ public function register()
             'source' => new SourceContextProvider('utf-8', base_path()),
         ]);
 
-        $app = $this->app;
-        VarDumper::setHandler(function ($var) use ($app, $connection) {
-            $app->makeWith(Dumper::class, ['connection' => $connection])->dump($var);
+        VarDumper::setHandler(function ($var) use ($connection) {
+            $this->app->makeWith(Dumper::class, ['connection' => $connection])->dump($var);
         });
     }
 }