Unify accessing fields with multiple values

Author: clue

src/Protocol/Action.php

@@ -6,6 +6,22 @@ class Action extends Message
 {
     public function __construct(array $fields = array())
     {
+        foreach ($fields as $key => &$value) {
+            if (is_array($value)) {
+                foreach ($value as $k => &$v) {
+                    if ($v === null) {
+                        unset($value[$k]);
+                    } elseif (!is_int($k)) {
+                        $v = $k . '=' . $v;
+                    }
+                }
+                $value = array_values($value);
+            }
+
+            if ($value === null || $value === array()) {
+                unset($fields[$key]);
+            }
+        }
         $this->fields = $fields;
     }
 
@@ -17,9 +33,6 @@ public function getMessageSerialized()
                 $values = array($values);
             }
             foreach ($values as $i => $value) {
-                if (!is_int($i)) {
-                    $value = $i . '=' . $value;
-                }
                 $message .= $key . ': ' . $value . "\r\n";
             }
         }

src/Protocol/Message.php

@@ -11,13 +11,23 @@ public function getActionId()
         return $this->getFieldValue('ActionId');
     }
 
+    /**
+     * Returns the first value for the field with the given $key
+     *
+     * @param string $key
+     * @return string|NULL
+     */
     public function getFieldValue($key)
     {
         $key = strtolower($key);
 
         foreach ($this->fields as $part => $value) {
             if (strtolower($part) === $key) {
-                return $value;
+                if (is_array($value)) {
+                    return reset($value);
+                } else {
+                    return $value;
+                }
             }
         }
 

tests/Protocol/ActionTest.php

@@ -16,6 +16,11 @@ public function testIdCanBeSet()
         $action = new Action(array('ActionID' => '123'));
 
         $this->assertEquals('123', $action->getActionId());
+
+        $this->assertEquals('123', $action->getFieldValue('ActionID'));
+        $this->assertEquals('123', $action->getFieldValue('aCtIoNiD'));
+
+        $this->assertNull($action->getFieldValue('unknown'));
     }
 
     public function testOneFieldValue()
@@ -32,17 +37,46 @@ public function testMultipleFieldsSingleValue()
         $this->assertEquals("Action: name\r\nKey: Value\r\n\r\n", $action->getMessageSerialized());
     }
 
+    public function testOneFieldNoValue()
+    {
+        $action = new Action(array('Key' => null));
+
+        $this->assertEquals("\r\n", $action->getMessageSerialized());
+
+        $this->assertNull($action->getFieldValue('Key'));
+    }
+
+    public function testOneFieldNoValues()
+    {
+        $action = new Action(array('Key' => array()));
+
+        $this->assertEquals("\r\n", $action->getMessageSerialized());
+
+        $this->assertNull($action->getFieldValue('Key'));
+    }
+
     public function testOneFieldMultipleValues()
     {
         $action = new Action(array('Key' => array('Value1', 'Value2')));
 
         $this->assertEquals("Key: Value1\r\nKey: Value2\r\n\r\n", $action->getMessageSerialized());
     }
 
+    public function testOneFieldMultipleValuesIgnoreNulls()
+    {
+        $action = new Action(array('Key' => array(null, 'value', null)));
+
+        $this->assertEquals("Key: value\r\n\r\n", $action->getMessageSerialized());
+
+        $this->assertEquals('value', $action->getFieldValue('Key'));
+    }
+
     public function testOneFieldMultipleKeyValues()
     {
         $action = new Action(array('Variables' => array('first' => 'on', 'second' => 'off')));
 
         $this->assertEquals("Variables: first=on\r\nVariables: second=off\r\n\r\n", $action->getMessageSerialized());
+
+        $this->assertEquals('first=on', $action->getFieldValue('Variables'));
     }
 }