Merge branch 'message'

Author: clue

src/Client.php

@@ -129,8 +129,8 @@ public function isBusy()
 
     public function createAction($name, array $args = array())
     {
-        $args = array('ActionID' => (string)++$this->actionId) + $args;
+        $args = array('Action' => $name, 'ActionID' => (string)++$this->actionId) + $args;
 
-        return new Action($name, $args);
+        return new Action($args);
     }
 }

src/Protocol/Action.php

@@ -4,17 +4,14 @@
 
 class Action extends Message
 {
-    private $action;
-
-    public function __construct($action, array $parts = array())
+    public function __construct(array $parts = array())
     {
-        $this->action = $action;
         $this->parts = $parts;
     }
 
     public function getMessageSerialized()
     {
-        $message = 'Action: ' . $this->action . "\r\n";
+        $message = '';
         foreach ($this->parts as $key => $values) {
             if (!is_array($values)) {
                 $values = array($values);

src/Protocol/Event.php

@@ -4,16 +4,13 @@
 
 class Event extends Message
 {
-    private $name;
-
-    public function __construct($name, array $parts)
+    public function __construct(array $parts)
     {
-        $this->name = $name;
         $this->parts = $parts;
     }
 
     public function getName()
     {
-        return $this->name;
+        return $this->getPart('Event');
     }
 }

src/Protocol/Parser.php

@@ -57,11 +57,11 @@ private function parseMessage($message)
             $parts[$key] = $value;
         }
 
-        $value = reset($parts);
+        reset($parts);
         $key = key($parts);
 
         if ($key === 'Event') {
-            return new Event($value, $parts);
+            return new Event($parts);
         }
 
         return new Response($parts);

tests/CollectorTest.php

@@ -17,7 +17,7 @@ public function testCollectingSIPEvents()
         $client->expects($this->once())
                  ->method('createAction')
                  ->with($this->equalTo('SIPPeers'), $this->equalTo(array()))
-                 ->will($this->returnValue(new Action('SIPPeers', array('ActionID' => '123'))));
+                 ->will($this->returnValue(new Action(array('Action' => 'SIPPeers', 'ActionID' => '123'))));
 
         $collector = new Collector($client);
 
@@ -35,12 +35,12 @@ public function testCollectingSIPEvents()
         $response = new Response(array('Response' => 'Success', 'ActionID' => '123'));
 
         $client->handleMessage($response);
-        $client->handleMessage(new Event('PeerEntry', array('ActionID' => '123')));
-        $client->handleMessage(new Event('PeerEntry', array('ActionID' => '123')));
+        $client->handleMessage(new Event(array('Event' => 'PeerEntry', 'ActionID' => '123')));
+        $client->handleMessage(new Event(array('Event' => 'PeerEntry', 'ActionID' => '123')));
 
         $this->assertNull($resolved);
 
-        $client->handleMessage(new Event('PeerlistComplete', array('EventList' => 'complete', 'ListItems' => '2', 'ActionID' => '123')));
+        $client->handleMessage(new Event(array('Event' => 'PeerlistComplete', 'EventList' => 'complete', 'ListItems' => '2', 'ActionID' => '123')));
 
         $this->assertNotNull($resolved);
 

tests/Protocol/ActionTest.php

@@ -6,42 +6,42 @@ class ActionTest extends TestCase
 {
     public function testIdDefaultsToNull()
     {
-        $action = new Action('name');
+        $action = new Action();
 
         $this->assertNull($action->getActionId());
     }
 
     public function testIdCanBeSet()
     {
-        $action = new Action('name', array('ActionID' => '123'));
+        $action = new Action(array('ActionID' => '123'));
 
         $this->assertEquals('123', $action->getActionId());
     }
 
     public function testSerializeSimple()
     {
-        $action = new Action('name');
+        $action = new Action(array('Action' => 'name'));
 
         $this->assertEquals("Action: name\r\n\r\n", $action->getMessageSerialized());
     }
 
     public function testSerializeKeySingle()
     {
-        $action = new Action('name', array('Key' => 'Value'));
+        $action = new Action(array('Action' => 'name', 'Key' => 'Value'));
 
         $this->assertEquals("Action: name\r\nKey: Value\r\n\r\n", $action->getMessageSerialized());
     }
 
     public function testSerializeKeyMultipleValues()
     {
-        $action = new Action('name', array('Key' => array('Value1', 'Value2')));
+        $action = new Action(array('Action' => 'name', 'Key' => array('Value1', 'Value2')));
 
         $this->assertEquals("Action: name\r\nKey: Value1\r\nKey: Value2\r\n\r\n", $action->getMessageSerialized());
     }
 
     public function testSerializeKeyMultipleKeyValues()
     {
-        $action = new Action('name', array('Variables' => array('first' => 'on', 'second' => 'off')));
+        $action = new Action(array('Action' => 'name', 'Variables' => array('first' => 'on', 'second' => 'off')));
 
         $this->assertEquals("Action: name\r\nVariables: first=on\r\nVariables: second=off\r\n\r\n", $action->getMessageSerialized());
     }