Merge pull request #29 from clue-labs/parse-without-space

Support parsing messages with missing space after colon

Author: clue

src/Protocol/Parser.php

@@ -50,11 +50,12 @@ private function parseMessage($message)
                 $key = Response::FIELD_COMMAND_OUTPUT;
                 $value = $line;
             } else {
-                $pos = strpos($line, ': ');
+                $pos = strpos($line, ':');
                 if ($pos === false) {
                     throw new \UnexpectedValueException('Parse error, no colon in line "' . $line . '" found');
                 }
-                $value = substr($line, $pos + 2);
+
+                $value = (string)substr($line, $pos + (isset($line[$pos + 1]) && $line[$pos + 1] === ' ' ? 2 : 1));
                 $key = substr($line, 0, $pos);
             }
 

tests/Protocol/ParserTest.php

@@ -124,14 +124,33 @@ public function testParsingInvalidResponseFails()
         $parser->push("invalid response\r\n\r\n");
     }
 
-    /**
-     * @expectedException UnexpectedValueException
-     */
-    public function testParsingInvalidResponseNoSpaceAfterColonFails()
+    public function testParsingMissingSpaceWithValue()
     {
         $parser = new Parser();
         $this->assertEquals(array(), $parser->push("Asterisk Call Manager/1.3\r\n"));
 
-        $parser->push("Response:NoSpace\r\n\r\n");
+        $ret = $parser->push("Response:NoSpace\r\n\r\n");
+        $this->assertCount(1, $ret);
+
+        $first = reset($ret);
+        /* @var $first Clue\React\Ami\Protocol\Response */
+
+        $this->assertInstanceOf('Clue\React\Ami\Protocol\Response', $first);
+        $this->assertEquals('NoSpace', $first->getFieldValue('Response'));
+    }
+
+    public function testParsingMissingSpaceEmptyValue()
+    {
+        $parser = new Parser();
+        $this->assertEquals(array(), $parser->push("Asterisk Call Manager/1.3\r\n"));
+
+        $ret = $parser->push("Response:\r\n\r\n");
+        $this->assertCount(1, $ret);
+
+        $first = reset($ret);
+        /* @var $first Clue\React\Ami\Protocol\Response */
+
+        $this->assertInstanceOf('Clue\React\Ami\Protocol\Response', $first);
+        $this->assertEquals('', $first->getFieldValue('Response'));
     }
 }