feat: merge config

src/EloquentDumperServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace Recca0120\EloquentDumper;
 
+use Closure;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Support\Arr;
@@ -16,18 +17,20 @@ class EloquentDumperServiceProvider extends ServiceProvider
      */
     public function register()
     {
+        $this->mergeConfigFrom(__DIR__.'/../config/eloquent-dumper.php', 'eloquent-dumper');
+
         $this->app->singleton(Dumper::class, function ($app) {
             return new Dumper(
                 Arr::get($app['config'], 'eloquent-dumper.driver', Dumper::DEFAULT)
             );
         });
 
-        $closures = $this->getClosures();
+        $this->app->singleton(EloquentHelper::class, EloquentHelper::class);
 
-        Builder::macro($closures['sql']['name'], $closures['sql']['method']);
-        QueryBuilder::macro($closures['sql']['name'], $closures['sql']['method']);
-        Builder::macro($closures['dump']['name'], $closures['dump']['method']);
-        QueryBuilder::macro($closures['dump']['name'], $closures['dump']['method']);
+        Builder::macro('sql', self::sql());
+        QueryBuilder::macro('sql', self::sql());
+        Builder::macro('dumpSql', self::dump());
+        QueryBuilder::macro('dumpSql', self::dump());
     }
 
     /**
@@ -45,33 +48,22 @@ public function boot()
     }
 
     /**
-     * @return array[]
+     * @return Closure
      */
-    private function getClosures()
+    private static function sql()
     {
-        $app = $this->app;
-
-        return [
-            'sql' => [
-                'name' => 'sql',
-                'method' => function () use ($app) {
-                    return $app->make(Dumper::class)->dump($this->toSql(), $this->getBindings());
-                },
-            ],
-            'dump' => [
-                'name' => 'dumpSql',
-                'method' => function () use ($app) {
-                    $sql = $app->make(Dumper::class)->dump($this->toSql(), $this->getBindings());
-
-                    if ($app->runningInConsole()) {
-                        echo "\n".$sql."\n";
-
-                        return;
-                    }
+        return function () {
+            return app(EloquentHelper::class)->sql($this);
+        };
+    }
 
-                    function_exists('dump') ? dump($sql) : var_dump($sql);
-                },
-            ],
-        ];
+    /**
+     * @return Closure
+     */
+    private static function dump()
+    {
+        return function () {
+            return app(EloquentHelper::class)->dump($this);
+        };
     }
 }

src/EloquentHelper.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Recca0120\EloquentDumper;
+
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+
+class EloquentHelper
+{
+    /**
+     * @var Dumper
+     */
+    private $dumper;
+    /**
+     * @var bool
+     */
+    private $runningInConsole;
+    /**
+     * @var Application
+     */
+    private $app;
+
+    /**
+     * EloquentHelper constructor.
+     * @param Dumper $dumper
+     * @param Application $app
+     */
+    public function __construct(Dumper $dumper, Application $app)
+    {
+        $this->dumper = $dumper;
+        $this->app = $app;
+    }
+
+    /**
+     * @param QueryBuilder|Builder $query
+     * @return string
+     */
+    public function sql($query)
+    {
+        return $this->dumper->dump($query->toSql(), $query->getBindings());
+    }
+
+    /**
+     * @param QueryBuilder|Builder $query
+     * @return Builder|QueryBuilder
+     */
+    public function dump($query)
+    {
+        $sql = $this->sql($query);
+
+        if ($this->app->runningInConsole()) {
+            echo "\n".$sql."\n";
+
+            return $query;
+        }
+
+        function_exists('dump') ? dump($sql) : var_dump($sql);
+
+        return $query;
+    }
+}