Fixed bugs in Server. CS fixes.

Daniel LaBarge · Daniel LaBarge · commit 058506c2f1b9 · 2017-04-18T01:46:15.000-05:00
diff --git a/.php_cs b/.php_cs
@@ -20,7 +20,6 @@ return Config::create()
         ],
         'binary_operator_spaces' => [
             'align_double_arrow' => true,
-            'align_equals' => true,
         ],
     ])
     ->setFinder(
diff --git a/src/Broker.php b/src/Broker.php
@@ -284,8 +284,8 @@ protected function maxConnections()
     protected function resolveMessage($message)
     {
         $arguments = (array) json_decode($message, true);
-        $name      = array_get($arguments, 'name');
-        $class     = $this->resolveMessageClass($name);
+        $name = array_get($arguments, 'name');
+        $class = $this->resolveMessageClass($name);
 
         return new $class($arguments);
     }
diff --git a/src/Commands/GetJob.php b/src/Commands/GetJob.php
@@ -12,7 +12,7 @@ class GetJob extends Command
     public function run()
     {
         $dispatcher = $this->dispatcher();
-        $job        = $dispatcher->connector()
+        $job = $dispatcher->connector()
             ->pop($dispatcher->queue());
         if ( ! $job) {
             return;
diff --git a/src/Commands/NotifyConnection.php b/src/Commands/NotifyConnection.php
@@ -17,7 +17,7 @@ public function __construct(array $arguments = [])
     {
         parent::__construct($arguments);
         $this->receiver = array_get($arguments, 'receiver');
-        $this->sender   = array_get($arguments, 'sender');
+        $this->sender = array_get($arguments, 'sender');
     }
 
     /**
@@ -32,7 +32,7 @@ public function run()
 
         $receiver = $everyone->uuid($this->receiver);
 
-        $notification  = new Notification($this->sender);
+        $notification = new Notification($this->sender);
         $notifications = $receiver->notifications();
         $notifications->put($notification->sender(), $notification);
 
diff --git a/src/Commands/RunQueuedCommands.php b/src/Commands/RunQueuedCommands.php
@@ -12,7 +12,7 @@ class RunQueuedCommands extends Command
     public function run()
     {
         $dispatcher = $this->dispatcher();
-        $commands   = $dispatcher->commands();
+        $commands = $dispatcher->commands();
 
         $commands->each(function ($command) use ($dispatcher, $commands) {
             $dispatcher->run($command);
diff --git a/src/Console/ServerStart.php b/src/Console/ServerStart.php
@@ -37,7 +37,7 @@ public function __construct()
      */
     protected function makeSignature()
     {
-        $options   = [];
+        $options = [];
         $options[] = '--A|address='.config('server.address').' : The address that the server will bind to for client connections';
         $options[] = '--P|port='.config('server.port').' : The port that the server will listen on for client connections';
         $options[] = '--Q|queue='.config('server.queue').' : The message queue that the server will be responsible for processing';
diff --git a/src/Contracts/Connection.php b/src/Contracts/Connection.php
@@ -9,10 +9,10 @@
 interface Connection extends ConnectionInterface
 {
     const ANONYMOUS = 'anonymous';
-    const PLAYER    = 'player';
+    const PLAYER = 'player';
     const SPECTATOR = 'spectator';
-    const WINNER    = 'winner';
-    const LOSER     = 'loser';
+    const WINNER = 'winner';
+    const LOSER = 'loser';
 
     /**
      * Get or set the socket for the connection.
diff --git a/src/Entities/Promise.php b/src/Entities/Promise.php
@@ -152,7 +152,7 @@ public function then($promise)
         $promise->dispatcher($this->dispatcher());
 
         $this->promises = $this->promises ?: [$this];
-        $last           = end($this->promises);
+        $last = end($this->promises);
         $last->instance()->then(
             function ($result) use ($promise) {
                 return $promise->resolve($result);
diff --git a/src/Entities/Timer.php b/src/Entities/Timer.php
@@ -16,7 +16,7 @@ abstract class Timer implements TimerInterface
     protected $counter = 0;
     protected $dispatcher;
     protected $interval;
-    protected $paused  = false;
+    protected $paused = false;
     protected $started = false;
     protected $timeout;
     protected $timer;
diff --git a/src/Manager.php b/src/Manager.php
@@ -498,8 +498,8 @@ public function queue($name = null)
      */
     public function work(Job $job)
     {
-        $payload   = $job->getRawBody();
-        $message   = json_decode($payload, true);
+        $payload = $job->getRawBody();
+        $message = json_decode($payload, true);
         $arguments = array_get($message, 'data', []);
 
         $command = array_get($message, 'job');
diff --git a/src/Messages/CurrentUptime.php b/src/Messages/CurrentUptime.php
@@ -15,9 +15,9 @@ class CurrentUptime extends Message implements ServerMessage
      */
     public function __construct(Carbon $start)
     {
-        $now           = Carbon::now();
+        $now = Carbon::now();
         $this->elapsed = $now->diffInSeconds($start);
-        $this->start   = $start->timestamp;
-        $this->now     = $now->timestamp;
+        $this->start = $start->timestamp;
+        $this->now = $now->timestamp;
     }
 }
diff --git a/src/Messages/JoinAsType.php b/src/Messages/JoinAsType.php
@@ -21,20 +21,20 @@ abstract class JoinAsType extends Message implements ClientMessage, SelfHandling
     public function __construct(array $arguments = [])
     {
         parent::__construct($arguments);
-        $this->email      = array_get($arguments, 'registration.email', 'Not Available');
+        $this->email = array_get($arguments, 'registration.email', 'Not Available');
         $this->first_name = array_get($arguments, 'registration.name.first');
-        $this->last_name  = array_get($arguments, 'registration.name.last');
-        $this->type       = Connection::ANONYMOUS;
+        $this->last_name = array_get($arguments, 'registration.name.last');
+        $this->type = Connection::ANONYMOUS;
     }
 
     /**
      * Handle the message.
      */
     public function handle()
     {
-        $connection         = array_filter($this->attributes);
+        $connection = array_filter($this->attributes);
         $connection['uuid'] = $this->client()->uuid();
-        $command            = new RegisterConnection(compact('connection'));
+        $command = new RegisterConnection(compact('connection'));
 
         return $this->dispatcher()->run($command);
     }
diff --git a/src/Messages/MessageException.php b/src/Messages/MessageException.php
@@ -16,7 +16,7 @@ class MessageException extends Message implements ServerMessage
     public function __construct(Exception $exception)
     {
         $this->exception = get_class($exception);
-        $this->message   = $exception->getMessage();
-        $this->code      = $exception->getCode() ? $exception->getCode() : 400;
+        $this->message = $exception->getMessage();
+        $this->code = $exception->getCode() ? $exception->getCode() : 400;
     }
 }
diff --git a/src/Messages/NotifyConnection.php b/src/Messages/NotifyConnection.php
@@ -19,6 +19,6 @@ public function __construct(array $arguments = [])
     {
         parent::__construct($arguments);
         $this->receiver = array_get($arguments, 'receiver');
-        $this->sender   = array_get($arguments, 'sender');
+        $this->sender = array_get($arguments, 'sender');
     }
 }
diff --git a/src/Messages/PromptForAuthentication.php b/src/Messages/PromptForAuthentication.php
@@ -16,7 +16,7 @@ class PromptForAuthentication extends Message implements ServerMessage
     public function __construct(ClientMessage $message)
     {
         $this->previous = $message->toArray();
-        $this->message  = 'Authorization required.';
-        $this->code     = 401;
+        $this->message = 'Authorization required.';
+        $this->code = 401;
     }
 }
diff --git a/src/Server.php b/src/Server.php
@@ -26,7 +26,7 @@ class Server implements ServerInterface
     protected $http;
     protected $manager;
     protected $output;
-    protected $port  = 8080;
+    protected $port = 8080;
     protected $queue = 'default';
     protected $socket;
     protected $websocket;
@@ -302,12 +302,12 @@ public function usesQueue($connection = null, $name = null)
     public function connector(Queue $instance = null)
     {
         if ( ! is_null($instance)) {
-            $this->config(__FUNCTION__, $instance);
-        }
+            $this->manager->connector($instance);
 
-        $this->manager()->connector($instance);
+            return $this;
+        }
 
-        return $this;
+        return $this->manager()->connector();
     }
 
     /**
@@ -323,12 +323,12 @@ public function connector(Queue $instance = null)
     public function queue($name = null)
     {
         if ( ! is_null($name)) {
-            $this->config(__FUNCTION__, $name);
-        }
+            $this->manager()->queue($name);
 
-        $this->manager()->queue($name);
+            return $this;
+        }
 
-        return $this;
+        return $this->manager()->queue();
     }
 
     /**
@@ -343,9 +343,13 @@ public function queue($name = null)
      */
     public function logger(OutputInterface $interface = null)
     {
-        $this->broker()->logger($interface);
+        if ( ! is_null($interface)) {
+            $this->broker()->logger($interface);
 
-        return $this;
+            return $this;
+        }
+
+        return $this->broker()->logger();
     }
 
     /**
diff --git a/src/Traits/AwsAsyncHelpers.php b/src/Traits/AwsAsyncHelpers.php
@@ -19,10 +19,10 @@ trait AwsAsyncHelpers
      */
     protected function awsHttpHandler()
     {
-        $loop    = Server::instance()->loop();
+        $loop = Server::instance()->loop();
         $adapter = new HttpClientAdapter($loop);
         $handler = HandlerStack::create($adapter);
-        $client  = new GuzzleClient(['handler' => $handler]);
+        $client = new GuzzleClient(['handler' => $handler]);
 
         return new GuzzleHandler($client);
     }
@@ -65,7 +65,7 @@ protected function awsS3($region = null)
      */
     protected function awsS3Credentials()
     {
-        $key    = $this->awsS3Config('key');
+        $key = $this->awsS3Config('key');
         $secret = $this->awsS3Config('secret');
 
         return compact('key', 'secret');

Original file line number	Diff line number	Diff line change
`@@ -284,8 +284,8 @@ protected function maxConnections()`
`284`	`284`	`protected function resolveMessage($message)`
`285`	`285`	`{`
`286`	`286`	`$arguments = (array) json_decode($message, true);`
`287`		`- $name = array_get($arguments, 'name');`
`288`		`- $class = $this->resolveMessageClass($name);`
	`287`	`+ $name = array_get($arguments, 'name');`
	`288`	`+ $class = $this->resolveMessageClass($name);`
`289`	`289`
`290`	`290`	`return new $class($arguments);`
`291`	`291`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class GetJob extends Command`
`12`	`12`	`public function run()`
`13`	`13`	`{`
`14`	`14`	`$dispatcher = $this->dispatcher();`
`15`		`- $job = $dispatcher->connector()`
	`15`	`+ $job = $dispatcher->connector()`
`16`	`16`	`->pop($dispatcher->queue());`
`17`	`17`	`if ( ! $job) {`
`18`	`18`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function __construct(array $arguments = [])`
`17`	`17`	`{`
`18`	`18`	`parent::__construct($arguments);`
`19`	`19`	`$this->receiver = array_get($arguments, 'receiver');`
`20`		`- $this->sender = array_get($arguments, 'sender');`
	`20`	`+ $this->sender = array_get($arguments, 'sender');`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`/**`
`@@ -32,7 +32,7 @@ public function run()`
`32`	`32`
`33`	`33`	`$receiver = $everyone->uuid($this->receiver);`
`34`	`34`
`35`		`- $notification = new Notification($this->sender);`
	`35`	`+ $notification = new Notification($this->sender);`
`36`	`36`	`$notifications = $receiver->notifications();`
`37`	`37`	`$notifications->put($notification->sender(), $notification);`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class RunQueuedCommands extends Command`
`12`	`12`	`public function run()`
`13`	`13`	`{`
`14`	`14`	`$dispatcher = $this->dispatcher();`
`15`		`- $commands = $dispatcher->commands();`
	`15`	`+ $commands = $dispatcher->commands();`
`16`	`16`
`17`	`17`	`$commands->each(function ($command) use ($dispatcher, $commands) {`
`18`	`18`	`$dispatcher->run($command);`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function __construct()`
`37`	`37`	`*/`
`38`	`38`	`protected function makeSignature()`
`39`	`39`	`{`
`40`		`- $options = [];`
	`40`	`+ $options = [];`
`41`	`41`	`$options[] = '--A\|address='.config('server.address').' : The address that the server will bind to for client connections';`
`42`	`42`	`$options[] = '--P\|port='.config('server.port').' : The port that the server will listen on for client connections';`
`43`	`43`	`$options[] = '--Q\|queue='.config('server.queue').' : The message queue that the server will be responsible for processing';`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@ class CurrentUptime extends Message implements ServerMessage`
`15`	`15`	`*/`
`16`	`16`	`public function __construct(Carbon $start)`
`17`	`17`	`{`
`18`		`- $now = Carbon::now();`
	`18`	`+ $now = Carbon::now();`
`19`	`19`	`$this->elapsed = $now->diffInSeconds($start);`
`20`		`- $this->start = $start->timestamp;`
`21`		`- $this->now = $now->timestamp;`
	`20`	`+ $this->start = $start->timestamp;`
	`21`	`+ $this->now = $now->timestamp;`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,20 +21,20 @@ abstract class JoinAsType extends Message implements ClientMessage, SelfHandling`
`21`	`21`	`public function __construct(array $arguments = [])`
`22`	`22`	`{`
`23`	`23`	`parent::__construct($arguments);`
`24`		`- $this->email = array_get($arguments, 'registration.email', 'Not Available');`
	`24`	`+ $this->email = array_get($arguments, 'registration.email', 'Not Available');`
`25`	`25`	`$this->first_name = array_get($arguments, 'registration.name.first');`
`26`		`- $this->last_name = array_get($arguments, 'registration.name.last');`
`27`		`- $this->type = Connection::ANONYMOUS;`
	`26`	`+ $this->last_name = array_get($arguments, 'registration.name.last');`
	`27`	`+ $this->type = Connection::ANONYMOUS;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`/**`
`31`	`31`	`* Handle the message.`
`32`	`32`	`*/`
`33`	`33`	`public function handle()`
`34`	`34`	`{`
`35`		`- $connection = array_filter($this->attributes);`
	`35`	`+ $connection = array_filter($this->attributes);`
`36`	`36`	`$connection['uuid'] = $this->client()->uuid();`
`37`		`- $command = new RegisterConnection(compact('connection'));`
	`37`	`+ $command = new RegisterConnection(compact('connection'));`
`38`	`38`
`39`	`39`	`return $this->dispatcher()->run($command);`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class MessageException extends Message implements ServerMessage`
`16`	`16`	`public function __construct(Exception $exception)`
`17`	`17`	`{`
`18`	`18`	`$this->exception = get_class($exception);`
`19`		`- $this->message = $exception->getMessage();`
`20`		`- $this->code = $exception->getCode() ? $exception->getCode() : 400;`
	`19`	`+ $this->message = $exception->getMessage();`
	`20`	`+ $this->code = $exception->getCode() ? $exception->getCode() : 400;`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ public function __construct(array $arguments = [])`
`19`	`19`	`{`
`20`	`20`	`parent::__construct($arguments);`
`21`	`21`	`$this->receiver = array_get($arguments, 'receiver');`
`22`		`- $this->sender = array_get($arguments, 'sender');`
	`22`	`+ $this->sender = array_get($arguments, 'sender');`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class PromptForAuthentication extends Message implements ServerMessage`
`16`	`16`	`public function __construct(ClientMessage $message)`
`17`	`17`	`{`
`18`	`18`	`$this->previous = $message->toArray();`
`19`		`- $this->message = 'Authorization required.';`
`20`		`- $this->code = 401;`
	`19`	`+ $this->message = 'Authorization required.';`
	`20`	`+ $this->code = 401;`
`21`	`21`	`}`
`22`	`22`	`}`