Added Request::verify() and Query::verify(), which the Client runs before sending the request (fixes #8);

In relation to the above, Communicator::verifyLengthSupport() is now public;
Unmarked the 3 byte length test, as it seems to work now for some reason (still not the 4 byte length one though);
Fixed a ResponseCollection::orderBy() test.

Author: boenrobot

src/PEAR2/Net/RouterOS/Client.php

@@ -282,7 +282,7 @@ private static function _login(
                 . pack('H*', $response->getProperty('ret'))
             )
         );
-        $request->send($com);
+        $request->verify($com)->send($com);
 
         $response = new Response($com, false, $timeout);
         if ($response->getType() === Response::TYPE_FINAL) {
@@ -790,7 +790,7 @@ public function __destruct()
      */
     protected function send(Request $request)
     {
-        $request->send($this->com, $this->registry);
+        $request->verify($this->com)->send($this->com, $this->registry);
         $this->pendingRequestsCount++;
         return $this;
     }

src/PEAR2/Net/RouterOS/Communicator.php

@@ -134,7 +134,8 @@ public function __construct(
                     array(
                         'ssl' => array(
                             'ciphers' => 'ADH',
-                            'verify_peer' => false
+                            'verify_peer' => false,
+                            'verify_peer_name' => false
                         )
                     )
                 );
@@ -482,7 +483,7 @@ public function sendWordFromStream($prefix, $stream)
      *
      * @return void
      */
-    protected static function verifyLengthSupport($length)
+    public static function verifyLengthSupport($length)
     {
         if ($length > 0xFFFFFFFF) {
             throw new LengthException(

src/PEAR2/Net/RouterOS/Query.php

@@ -240,6 +240,39 @@ private function _send(Communicator $com)
         return $bytes;
     }
 
+    /**
+     * Verifies the query.
+     * 
+     * Verifies the query against a communicator, i.e. whether the query
+     * could successfully be sent (assuming the connection is still opened).
+     * 
+     * @param Communicator $com The Communicator to check against.
+     * 
+     * @return $this The query object itself.
+     * 
+     * @throws LengthException If the resulting length of an API word is not
+     *     supported.
+     */
+    public function verify(Communicator $com)
+    {
+        foreach ($this->words as $queryWord) {
+            list($predicate, $value) = $queryWord;
+            if (null === $value) {
+                $com::verifyLengthSupport(strlen('?' . $predicate));
+            } elseif (is_string($value)) {
+                $com::verifyLengthSupport(
+                    strlen('?' . $predicate . '=' . $value)
+                );
+            } else {
+                $com::verifyLengthSupport(
+                    strlen('?' . $predicate . '=') +
+                    $com::seekableStreamLength($value)
+                );
+            }
+        }
+        return $this;
+    }
+
     /**
      * Adds a condition.
      *

src/PEAR2/Net/RouterOS/Request.php

@@ -339,6 +339,40 @@ private function _send(Communicator $com)
         return $bytes;
     }
 
+    /**
+     * Verifies the request.
+     * 
+     * Verifies the request against a communicator, i.e. whether the request
+     * could successfully be sent (assuming the connection is still opened).
+     * 
+     * @param Communicator $com The Communicator to check against.
+     * 
+     * @return $this The request object itself.
+     * 
+     * @throws LengthException If the resulting length of an API word is not
+     *     supported.
+     */
+    public function verify(Communicator $com)
+    {
+        $com::verifyLengthSupport(strlen($this->getCommand()));
+        $com::verifyLengthSupport(strlen('.tag=' . (string)$this->getTag()));
+        foreach ($this->attributes as $name => $value) {
+            if (is_string($value)) {
+                $com::verifyLengthSupport(strlen('=' . $name . '=' . $value));
+            } else {
+                $com::verifyLengthSupport(
+                    strlen('=' . $name . '=') +
+                    $com::seekableStreamLength($value)
+                );
+            }
+        }
+        $query = $this->getQuery();
+        if ($query instanceof Query) {
+            $query->verify($com);
+        }
+        return $this;
+    }
+
     /**
      * Parses the arguments of a command.
      *

src/PEAR2/Net/RouterOS/Util.php

@@ -182,7 +182,7 @@ public static function parseValue($value)
                 );
                 //@codeCoverageIgnoreStart
                 // See previous ignored section's note.
-                // 
+                //
                 // This section is added for backwards compatibility with current
                 // PHP versions, when in the future sub-second support is added.
                 // In that event, the test inputs for older versions will be

tests/Client/Safe.php

@@ -1271,8 +1271,8 @@ public function testResponseCollectionOrderBy()
             $sortedByMaxLimitDownloadFirst
         );
         $this->assertNotSame(
-            $sortedByMaxLimitFirst,
-            $sortedByMaxLimitDownloadFirst
+            $sortedByMaxLimitLast,
+            $sortedByMaxLimitDownloadLast
         );
     }
 

tests/Client/Unsafe.php

@@ -120,9 +120,8 @@ public function testSendSyncReturningResponseStreamData()
 
     public function testSendSyncReturningResponseLarge3bytesLength()
     {
-        $this->markTestIncomplete(
-            'For some reason, my RouterOS v5.6 doesn not work with this (bug?).'
-        );
+        $memoryLimit = ini_set('memory_limit', -1);
+
         $systemResource = $this->object->sendSync(
             new Request('/system/resource/print')
         );
@@ -169,13 +168,18 @@ public function testSendSyncReturningResponseLarge3bytesLength()
                 );
             }
         }
+
+        //Clearing out for other tests.
+        ini_set('memory_limit', $memoryLimit);
     }
 
     public function testSendSyncReturningResponseLarge4bytesLength()
     {
         $this->markTestIncomplete(
-            'For some reason, my RouterOS v5.6 doesn not work with this (bug?).'
+            'For some reason, my RouterOS v6.* doesn not work with this (bug?).'
         );
+        $memoryLimit = ini_set('memory_limit', -1);
+
         $systemResource = $this->object->sendSync(
             new Request('/system/resource/print')
         );
@@ -222,19 +226,19 @@ public function testSendSyncReturningResponseLarge4bytesLength()
                 );
             }
         }
+
+        //Clearing out for other tests.
+        ini_set('memory_limit', $memoryLimit);
     }
 
     public function testSendSyncReturningResponseLargeDataException()
     {
-        $this->markTestIncomplete(
-            'TODO: A known issue; Requests with excessively long words "leak".'
-        );
         //Required for this test
         $memoryLimit = ini_set('memory_limit', -1);
         try {
             $comment = fopen('php://temp', 'r+b');
             fwrite($comment, str_repeat('t', 0xFFFFFF));
-            for ($i = 0; $i < 14; $i++) {
+            for ($i = 0; $i < 255; $i++) {
                 fwrite($comment, str_repeat('t', 0xFFFFFF));
             }
             fwrite(
@@ -243,14 +247,12 @@ public function testSendSyncReturningResponseLargeDataException()
             );
             rewind($comment);
 
-            $commentString = stream_get_contents($comment);
-            $maxArgL = 0xFFFFFFF - strlen('=comment=');
+            $maxArgL = 0xFFFFFFFF - strlen('=comment=');
             $this->assertGreaterThan(
                 $maxArgL,
-                strlen($commentString),
+                Communicator::seekableStreamLength($comment),
                 '$comment is not long enough.'
             );
-            unset($commentString);
             rewind($comment);
             $addRequest = new Request('/queue/simple/add');
             $addRequest->setArgument('name', TEST_QUEUE_NAME)