Allowed arguments in Request constructor to be spread across multiple lines;

The same fix has also been applied in Response's _receive() method to prevent cut offs at some edge case scenarios.

Author: boenrobot

RELEASE-1.0.0b3

@@ -2,7 +2,7 @@ Bug fixes on edge cases, and some API changes
 
 * Persistent connections are now properly supported. Added a new Registry class to facilitate this.
 * The second and third argument of Request::__construct() have been swapped.
-* At Request::__construct(), a backslash can now be escaped in an argument value.
+* At Request::__construct(), a backslash can now be escaped in an argument value, and arguments can be spread across multiple lines.
 * Client::getStreamResponses() and Client::setStreamResponses() are now Client::isStreamingResponses() and Client::setStreamingResponses(), respectively.
 * Query now uses things statically, allowing extensions in the process.
 * ResponseCollection::__invoke() now seeks instead of getting.

src/PEAR2/Net/RouterOS/Request.php

@@ -327,7 +327,7 @@ protected function parseArgumentString($string)
         $name = null;
         while ($string = substr($string, strlen($token))) {
             if (null === $name) {
-                if (preg_match('/^\s+([^\s=]+)/sm', $string, $matches)) {
+                if (preg_match('/^\s+([^\s=]+)/sS', $string, $matches)) {
                     $token = $matches[0];
                     $name = $matches[1];
                 } else {
@@ -336,13 +336,13 @@ protected function parseArgumentString($string)
                         41000
                     );
                 }
-            } elseif (preg_match('/^\s/sm', $string, $matches)) {
+            } elseif (preg_match('/^\s/s', $string, $matches)) {
                 //Empty argument
                 $token = '';
                 $this->setArgument($name);
                 $name = null;
             } elseif (
-                preg_match('/^="(([^\\\"]|\\\"|\\\\)*)"/sm', $string, $matches)
+                preg_match('/^="(([^\\\"]|\\\"|\\\\)*)"/sS', $string, $matches)
             ) {
                 $token = $matches[0];
                 $this->setArgument(
@@ -352,7 +352,7 @@ protected function parseArgumentString($string)
                     )
                 );
                 $name = null;
-            } elseif (preg_match('/^=(\S+)/sm', $string, $matches)) {
+            } elseif (preg_match('/^=(\S+)/sS', $string, $matches)) {
                 $token = $matches[0];
                 $this->setArgument($name, $matches[1]);
                 $name = null;

src/PEAR2/Net/RouterOS/Response.php

@@ -176,9 +176,9 @@ private function _receive(Communicator $com, $asStream = false)
             for ($word = $com->getNextWord(); '' !== $word;
                     $word = $com->getNextWord()
             ) {
-                if (preg_match('/^=([^=]+)=(.*)$/sm', $word, $matches)) {
+                if (preg_match('/^=([^=]+)=(.*)$/sS', $word, $matches)) {
                     $this->setArgument($matches[1], $matches[2]);
-                } elseif (preg_match('/^\.tag=(.*)$/sm', $word, $matches)) {
+                } elseif (preg_match('/^\.tag=(.*)$/sS', $word, $matches)) {
                     $this->setTag($matches[1]);
                 } else {
                     $this->unrecognizedWords[] = $word;

tests/RequestHandlingTest.php

@@ -153,7 +153,11 @@ public function testCommandTranslationWithArguments()
             '/ping address=192.168.0.1 count=2' => '/ping',
             '/ping address="192.168.0.1" count=2' => '/ping',
             '/ping address=192.168.0.1 count="2"' => '/ping',
-            '/ping address="192.168.0.1" count="2"' => '/ping'
+            '/ping address="192.168.0.1" count="2"' => '/ping',
+            '/ping address=192.168.0.1
+                count="2"' => '/ping',
+            '/ping address="192.168.0.1"
+                count="2"' => '/ping'
         );
         foreach ($commands as $command => $expected) {
             $request = new Request($command);
@@ -327,6 +331,12 @@ public function testCommandArgumentParsing()
                 => array('address' => '192.168.0.1', 'count' => '2'),
             '/ping address="192.168.0.1" count="2"'
                 => array('address' => '192.168.0.1', 'count' => '2'),
+            '/ping address=192.168.0.1
+                count="2"'
+                => array('address' => '192.168.0.1', 'count' => '2'),
+            '/ping address="192.168.0.1"
+                count="2"'
+                => array('address' => '192.168.0.1', 'count' => '2'),
         );
         foreach ($commands as $command => $expected) {
             $request = new Request($command);