formatting

Author: taylorotwell

src/Illuminate/Redis/Connections/Connection.php

@@ -3,8 +3,8 @@
 namespace Illuminate\Redis\Connections;
 
 use Closure;
-use Illuminate\Redis\Events\QueryExecuted;
 use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Redis\Events\CommandExecuted;
 use Illuminate\Redis\Limiters\DurationLimiterBuilder;
 use Illuminate\Redis\Limiters\ConcurrencyLimiterBuilder;
 
@@ -21,18 +21,18 @@ abstract class Connection
     protected $client;
 
     /**
-     * The event dispatcher instance.
+     * The Redis connection name.
      *
-     * @var \Illuminate\Contracts\Events\Dispatcher
+     * @var string|null
      */
-    protected $events;
+    protected $name;
 
     /**
-     * The Redis connection name.
+     * The event dispatcher instance.
      *
-     * @var string|null
+     * @var \Illuminate\Contracts\Events\Dispatcher
      */
-    protected $name;
+    protected $events;
 
     /**
      * Subscribe to a set of given channels for messages.
@@ -110,11 +110,13 @@ public function psubscribe($channels, Closure $callback)
     public function command($method, array $parameters = [])
     {
         $start = microtime(true);
+
         $result = $this->client->{$method}(...$parameters);
+
         $time = round((microtime(true) - $start) * 1000, 2);
 
         if (isset($this->events)) {
-            $this->event(new QueryExecuted($method, $parameters, $time, $this));
+            $this->event(new CommandExecuted($method, $parameters, $time, $this));
         }
 
         return $result;
@@ -134,15 +136,15 @@ protected function event($event)
     }
 
     /**
-     * Register a Redis query listener with the connection.
+     * Register a Redis command listener with the connection.
      *
      * @param  \Closure  $callback
      * @return void
      */
     public function listen(Closure $callback)
     {
         if (isset($this->events)) {
-            $this->events->listen(QueryExecuted::class, $callback);
+            $this->events->listen(CommandExecuted::class, $callback);
         }
     }
 

src/Illuminate/Redis/Events/QueryExecuted.php renamed to src/Illuminate/Redis/Events/CommandExecuted.php

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Redis\Events;
 
-class QueryExecuted
+class CommandExecuted
 {
     /**
      * The Redis command that was executed.
@@ -12,14 +12,14 @@ class QueryExecuted
     public $command;
 
     /**
-     * The array of query parameters.
+     * The array of command parameters.
      *
      * @var array
      */
     public $parameters;
 
     /**
-     * The number of milliseconds it took to execute the query.
+     * The number of milliseconds it took to execute the command.
      *
      * @var float
      */

src/Illuminate/Redis/RedisManager.php

@@ -44,7 +44,7 @@ class RedisManager implements Factory
      *
      * @var bool
      */
-    protected $events = true;
+    protected $events = false;
 
     /**
      * Create a new Redis manager instance.
@@ -121,7 +121,7 @@ protected function resolveCluster($name)
     }
 
     /**
-     * Get the connector instance for the current driver.
+     * Configure the given connection to prepare it for commands.
      *
      * @param  \Illuminate\Redis\Connections\Connection  $connection
      * @param  string  $name
@@ -132,7 +132,7 @@ protected function configure(Connection $connection, $name)
         $connection->setName($name);
 
         if ($this->events && $this->app->bound('events')) {
-            $connection->setEventDispatcher($this->app['events']);
+            $connection->setEventDispatcher($this->app->make('events'));
         }
 
         return $connection;
@@ -164,23 +164,23 @@ public function connections()
     }
 
     /**
-     * Enable setting event dispatcher on connections.
+     * Enable the firing of Redis command events.
      *
-     * @return array
+     * @return void
      */
     public function enableEvents()
     {
-        return $this->events = true;
+        $this->events = true;
     }
 
     /**
-     * Disable setting event dispatcher on connections.
+     * Disable the firing of Redis command events.
      *
-     * @return array
+     * @return void
      */
     public function disableEvents()
     {
-        return $this->events = false;
+        $this->events = false;
     }
 
     /**