From 4857497764e0bcc9d5d574e8e4d45ac2fde31e21 Mon Sep 17 00:00:00 2001
From: Dmitry Ivanov <dmitry.g.ivanov@gmail.com>
Date: Wed, 2 Aug 2017 16:45:25 +0300
Subject: [PATCH] DBP: Config merging added.

---
 src/DbProfilerServiceProvider.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/DbProfilerServiceProvider.php b/src/DbProfilerServiceProvider.php
index 351536a..dc0d8de 100644
--- a/src/DbProfilerServiceProvider.php
+++ b/src/DbProfilerServiceProvider.php
@@ -10,9 +10,9 @@ class DbProfilerServiceProvider extends ServiceProvider
 {
     private static $counter;
 
-    /* @laravel-versions */
     public function register()
     {
+        $this->mergeConfig();
     }
 
     private static function tickCounter()
@@ -69,4 +69,14 @@ private function applyBindings($sql, array $bindings)
 
         return $sql;
     }
+
+    private function mergeConfig()
+    {
+        $this->mergeConfigFrom($this->getConfigPath(), 'db-profiler');
+    }
+
+    private function getConfigPath()
+    {
+        return __DIR__ . '/../config/db-profiler.php';
+    }
 }