Merge branch 'master' into 6.x

Author: dmitry-ivanov

src/DbProfilerServiceProvider.php

@@ -2,67 +2,78 @@
 
 namespace Illuminated\Database;
 
+use Illuminate\Database\Events\QueryExecuted;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Request;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Database\Events\QueryExecuted;
+use Illuminate\Support\Str;
 
 class DbProfilerServiceProvider extends ServiceProvider
 {
-    private static $counter;
-
-    private static function tickCounter()
-    {
-        return self::$counter++;
-    }
+    /**
+     * The query counter.
+     *
+     * @var int
+     */
+    private $counter = 1;
 
+    /**
+     * Boot the service provider.
+     *
+     * @return void
+     *
+     * @noinspection ForgottenDebugOutputInspection
+     */
     public function boot()
     {
         if (!$this->isEnabled()) {
             return;
         }
 
-        self::$counter = 1;
-
         DB::listen(function (QueryExecuted $query) {
-            $i = self::tickCounter();
-            $sql = $this->applyBindings($query->sql, $query->bindings);
-            dump("[$i]: {$sql}; ({$query->time} ms)");
+            $i = $this->counter++;
+            $sql = $this->applyQueryBindings($query->sql, $query->bindings);
+            $time = $query->time;
+            dump("[{$i}]: {$sql}; ({$time} ms)");
         });
     }
 
+    /**
+     * Check whether database profiling is enabled or not.
+     *
+     * @return bool
+     */
     private function isEnabled()
     {
-        if (!config('db-profiler.force') && !$this->app->isLocal()) {
+        if (!$this->app->isLocal() && !config('db-profiler.force')) {
             return false;
         }
 
-        if ($this->app->runningInConsole()) {
-            return in_array('-vvv', $_SERVER['argv']);
-        }
-
-        return request()->exists('vvv');
+        return $this->app->runningInConsole()
+            ? collect($_SERVER['argv'])->contains('-vvv')
+            : Request::exists('vvv');
     }
 
-    private function applyBindings($sql, array $bindings)
+    /**
+     * Apply query bindings to the given SQL query.
+     *
+     * @param string $sql
+     * @param array $bindings
+     * @return string
+     */
+    private function applyQueryBindings(string $sql, array $bindings)
     {
-        if (empty($bindings)) {
-            return $sql;
-        }
-
-        foreach ($bindings as $binding) {
+        $bindings = collect($bindings)->map(function ($binding) {
             switch (gettype($binding)) {
                 case 'boolean':
-                    $binding = (int) $binding;
-                    break;
-
+                    return (int) $binding;
                 case 'string':
-                    $binding = "'{$binding}'";
-                    break;
+                    return "'{$binding}'";
+                default:
+                    return $binding;
             }
+        })->toArray();
 
-            $sql = preg_replace('/\?/', $binding, $sql, 1);
-        }
-
-        return $sql;
+        return Str::replaceArray('?', $bindings, $sql);
     }
 }

tests/ConsoleProfilingTest.php

@@ -4,42 +4,50 @@
 
 class ConsoleProfilingTest extends TestCase
 {
+    /**
+     * Define whether the app is running in console or not.
+     *
+     * @return bool
+     */
     protected function runningInConsole()
     {
         return true;
     }
 
+    /**
+     * Emulate the "vvv" flag set.
+     *
+     * @return $this
+     */
     protected function withVvv()
     {
         $_SERVER['argv']['-vvv'] = true;
+
         return $this;
     }
 
     /** @test */
     public function it_is_disabled_if_environment_is_not_local()
     {
         $this->notLocal()->boot();
+
         $this->assertDbProfilerNotActivated();
     }
 
     /** @test */
     public function it_is_disabled_if_environment_is_local_but_there_is_no_vvv_option()
     {
         $this->local()->boot();
+
         $this->assertDbProfilerNotActivated();
     }
 
     /** @test */
     public function it_is_enabled_if_environment_is_local_and_there_is_vvv_option()
     {
         $this->local()->withVvv()->boot();
-        $this->assertDbProfilerActivated();
-    }
 
-    /** @test */
-    public function it_dumps_all_database_queries_with_applied_bindings()
-    {
-        $this->local()->withVvv()->boot();
+        $this->assertDbProfilerActivated();
         $this->assertDbQueriesDumped();
     }
 }

tests/HttpProfilingTest.php

@@ -2,44 +2,54 @@
 
 namespace Illuminated\Database\Tests;
 
+use Illuminate\Support\Facades\Request;
+
 class HttpProfilingTest extends TestCase
 {
+    /**
+     * Define whether the app is running in console or not.
+     *
+     * @return bool
+     */
     protected function runningInConsole()
     {
         return false;
     }
 
+    /**
+     * Emulate the "vvv" flag set.
+     *
+     * @return $this
+     */
     protected function withVvv()
     {
-        request()['vvv'] = true;
+        Request::merge(['vvv' => true]);
+
         return $this;
     }
 
     /** @test */
     public function it_is_disabled_if_environment_is_not_local()
     {
         $this->notLocal()->boot();
+
         $this->assertDbProfilerNotActivated();
     }
 
     /** @test */
     public function it_is_disabled_if_environment_is_local_but_there_is_no_vvv_request_param()
     {
         $this->local()->boot();
+
         $this->assertDbProfilerNotActivated();
     }
 
     /** @test */
     public function it_is_enabled_if_environment_is_local_and_there_is_vvv_request_param()
     {
         $this->local()->withVvv()->boot();
-        $this->assertDbProfilerActivated();
-    }
 
-    /** @test */
-    public function it_dumps_all_database_queries_with_applied_bindings()
-    {
-        $this->local()->withVvv()->boot();
+        $this->assertDbProfilerActivated();
         $this->assertDbQueriesDumped();
     }
 }