Simplify message names

Author: clue

example/commands.php

@@ -3,8 +3,8 @@
 use Clue\React\Ami\Factory;
 use Clue\React\Ami\Client;
 use Clue\React\Ami\Api;
-use Clue\React\Ami\Protocol\ActionResponse;
-use Clue\React\Ami\Protocol\EventMessage;
+use Clue\React\Ami\Protocol\Response;
+use Clue\React\Ami\Protocol\Event;
 use Clue\React\Ami\Protocol\ErrorException;
 
 require __DIR__ . '/../vendor/autoload.php';
@@ -20,7 +20,7 @@
 
     $api->events(false);
 
-    $api->listCommands()->then(function (ActionResponse $response) {
+    $api->listCommands()->then(function (Response $response) {
         echo 'Commands: ' . implode(', ', array_keys($response->getParts())) . PHP_EOL;
     });
 
@@ -33,7 +33,7 @@
         echo '<' . $line . PHP_EOL;
 
         $api->command($line)->then(
-            function(ActionResponse $response) {
+            function(Response $response) {
                 echo $response->getPart('_') . PHP_EOL;
             },
             function (ErrorException $error) use ($line) {

example/events.php

@@ -3,8 +3,8 @@
 use Clue\React\Ami\Factory;
 use Clue\React\Ami\Client;
 use Clue\React\Ami\Api;
-use Clue\React\Ami\Protocol\ActionResponse;
-use Clue\React\Ami\Protocol\EventMessage;
+use Clue\React\Ami\Protocol\Response;
+use Clue\React\Ami\Protocol\Event;
 
 require __DIR__ . '/../vendor/autoload.php';
 
@@ -24,7 +24,7 @@ function (Client $client) use ($loop) {
             echo 'Connection closed' . PHP_EOL;
         });
 
-        $client->on('event', function (EventMessage $event) {
+        $client->on('event', function (Event $event) {
             echo 'Event: ' . $event->getName() . ': ' . $event->toJson() . PHP_EOL;
         });
     },

src/Api.php

@@ -3,10 +3,10 @@
 namespace Clue\React\Ami;
 
 use Clue\React\Ami\Client;
-use Clue\React\Ami\Protocol\ActionResponse;
-use Clue\React\Ami\Protocol\ActionRequest;
+use Clue\React\Ami\Protocol\Response;
+use Clue\React\Ami\Protocol\Action;
 use UnexpectedValueException;
-use Clue\React\Ami\Protocol\EventMessage;
+use Clue\React\Ami\Protocol\Event;
 
 class Api
 {
@@ -20,33 +20,33 @@ public function __construct(Client $client)
     public function login($username, $secret, $events = null)
     {
         $events = $this->boolParam($events);
-        return $this->client->request(new ActionRequest('Login', array('UserName' => $username, 'Secret' => $secret, 'Events' => $events)));
+        return $this->client->request(new Action('Login', array('UserName' => $username, 'Secret' => $secret, 'Events' => $events)));
     }
 
     public function logout()
     {
-        return $this->client->request(new ActionRequest('Logout'));
+        return $this->client->request(new Action('Logout'));
     }
 
     public function agentLogoff($agentId, $soft = false)
     {
         $bool = $soft ? 'true' : 'false';
-        return $this->client->request(new ActionRequest('AgentLogoff', array('Agent' => $agentId, 'Soft' => $bool)));
+        return $this->client->request(new Action('AgentLogoff', array('Agent' => $agentId, 'Soft' => $bool)));
     }
 
     public function ping()
     {
-        return $this->client->request(new ActionRequest('Ping'));
+        return $this->client->request(new Action('Ping'));
     }
 
     public function coreShowChannels()
     {
-        return $this->client->request(new ActionRequest('CoreShowChannels'));
+        return $this->client->request(new Action('CoreShowChannels'));
     }
 
     public function command($command)
     {
-        return $this->client->request(new ActionRequest('Command', array('Command' => $command)));
+        return $this->client->request(new Action('Command', array('Command' => $command)));
     }
 
     public function events($eventMask)
@@ -59,42 +59,42 @@ public function events($eventMask)
             $eventMask = implode(',', $eventMask);
         }
 
-        return $this->client->request(new ActionRequest('Events', array('EventMask' => $eventMask)));
+        return $this->client->request(new Action('Events', array('EventMask' => $eventMask)));
     }
 
     public function sipPeers()
     {
-        return $this->client->request(new ActionRequest('SIPPeers'));
+        return $this->client->request(new Action('SIPPeers'));
     }
 
     public function sipShowPeer($peerName)
     {
-        return $this->client->request(new ActionRequest('SIPshowpeer', array('Peer' => $peerName)));
+        return $this->client->request(new Action('SIPshowpeer', array('Peer' => $peerName)));
     }
 
     public function listCommands()
     {
-        return $this->client->request(new ActionRequest('ListCommands'));
+        return $this->client->request(new Action('ListCommands'));
     }
 
     public function sendText($channel, $message)
     {
-        return $this->client->request(new ActionRequest('Sendtext', array('Channel' => $channel, 'Message' => $message)));
+        return $this->client->request(new Action('Sendtext', array('Channel' => $channel, 'Message' => $message)));
     }
 
     public function hangup($channel, $cause)
     {
-        return $this->client->request(new ActionRequest('Hangup', array('Channel' => $channel, 'Cause' => $cause)));
+        return $this->client->request(new Action('Hangup', array('Channel' => $channel, 'Cause' => $cause)));
     }
 
     public function challenge($authType = 'MD5')
     {
-        return $this->client->request(new ActionRequest('Challenge', array('AuthType' => $authType)));
+        return $this->client->request(new Action('Challenge', array('AuthType' => $authType)));
     }
 
     public function getConfig($filename, $category = null)
     {
-        return $this->client->request(new ActionRequest('GetConfig', array('Filename' => $filename, 'Category' => $category)));
+        return $this->client->request(new Action('GetConfig', array('Filename' => $filename, 'Category' => $category)));
     }
 
     private function boolParam($value)

src/Client.php

@@ -2,8 +2,8 @@
 
 namespace Clue\React\Ami;
 
-use Clue\React\Ami\Protocol\EventMessage;
-use Clue\React\Ami\Protocol\ActionRequest;
+use Clue\React\Ami\Protocol\Event;
+use Clue\React\Ami\Protocol\Action;
 use Evenement\EventEmitter;
 use React\Stream\Stream;
 use Clue\React\Ami\Protocol\Parser;
@@ -40,7 +40,7 @@ public function __construct(Stream $stream, Parser $parser = null)
         $this->stream->resume();
     }
 
-    public function request(ActionRequest $message)
+    public function request(Action $message)
     {
         $deferred = new Deferred();
 
@@ -58,7 +58,7 @@ public function request(ActionRequest $message)
 
     public function handleMessage(Message $message)
     {
-        if ($message instanceof EventMessage) {
+        if ($message instanceof Event) {
             $this->emit('event', array($message));
             return;
         }

src/Protocol/ActionRequest.php src/Protocol/Action.phpsrc/Protocol/ActionRequest.php renamed to src/Protocol/Action.php

@@ -2,7 +2,7 @@
 
 namespace Clue\React\Ami\Protocol;
 
-class ActionRequest extends Message
+class Action extends Message
 {
     private $action;
 

src/Protocol/ErrorException.php

@@ -8,7 +8,7 @@ class ErrorException extends RuntimeException
 {
     private $response;
 
-    public function __construct(ActionResponse $response)
+    public function __construct(Response $response)
     {
         parent::__construct('Error "' . $response->getPart('Message') . '"');
         $this->response = $response;

src/Protocol/EventMessage.php src/Protocol/Event.phpsrc/Protocol/EventMessage.php renamed to src/Protocol/Event.php

@@ -2,7 +2,7 @@
 
 namespace Clue\React\Ami\Protocol;
 
-class EventMessage extends Message
+class Event extends Message
 {
     private $name;
 

src/Protocol/Parser.php

@@ -61,14 +61,14 @@ private function parseMessage($message)
         $key = key($parts);
 
         if ($key === 'Event') {
-            return new EventMessage($value, $parts);
+            return new Event($value, $parts);
         }
 
         if ($key === 'Response' && $value === 'Error') {
 
         }
 
-        return new ActionResponse($parts);
+        return new Response($parts);
     }
 
     public function clear()

src/Protocol/ActionResponse.php src/Protocol/Response.phpsrc/Protocol/ActionResponse.php renamed to src/Protocol/Response.php

@@ -2,7 +2,7 @@
 
 namespace Clue\React\Ami\Protocol;
 
-class ActionResponse extends Message
+class Response extends Message
 {
     public function __construct(array $parts)
     {