Merge branch 'command-end'

Conflicts:
	src/Protocol/Parser.php

Author: clue

src/Protocol/Parser.php

@@ -11,8 +11,8 @@ class Parser
     const EOL = "\r\n";
     const LEOL = 2;
 
-    const COMMAND_END = "\n--END COMMAND--";
-    const LCOMMAND_END = 16;
+    const COMMAND_END = "--END COMMAND--";
+    const LCOMMAND_END = 15;
 
     private $buffer = '';
     private $gotInitial = false;
@@ -40,9 +40,13 @@ public function push($chunk)
 
     private function parseMessage($message)
     {
+        $lines = explode(self::EOL, $message);
+        $last  = count($lines) - 1;
         $fields = array();
-        foreach (explode(self::EOL, $message) as $line) {
-            if (substr($line, -self::LCOMMAND_END) === self::COMMAND_END) {
+
+        foreach ($lines as $i => $line) {
+            $pos = strlen($line) - self::LCOMMAND_END - 1;
+            if ($i === $last && substr($line, -self::LCOMMAND_END) === self::COMMAND_END && ($pos < 0 || $line[$pos] === "\n")) {
                 $key = '_';
                 $value = $line;
             } else {

tests/Protocol/ParserTest.php

@@ -81,6 +81,38 @@ public function testParsingCommandResponse()
         $this->assertEquals("Testing: yes\nAnother Line\n--END COMMAND--", $first->getFieldValue('_'));
     }
 
+    public function testParsingCommandResponseEmpty()
+    {
+        $parser = new Parser();
+        $this->assertEquals(array(), $parser->push("Asterisk Call Manager/1.3\r\n"));
+
+        $ret = $parser->push("Response: Follows\r\n--END COMMAND--\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('Follows', $first->getFieldValue('Response'));
+        $this->assertEquals("--END COMMAND--", $first->getFieldValue('_'));
+    }
+
+    public function testParsingResponseIsNotCommandResponse()
+    {
+        $parser = new Parser();
+        $this->assertEquals(array(), $parser->push("Asterisk Call Manager/1.3\r\n"));
+
+        $ret = $parser->push("Response: Success\r\nMessage: Some message--END COMMAND--\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('Success', $first->getFieldValue('Response'));
+        $this->assertEquals('Some message--END COMMAND--', $first->getFieldValue('Message'));
+    }
+
     /**
      * @expectedException UnexpectedValueException
      */