Client::sendAsync() no longer throws an exception if a request is canceled multiple times by the returned value of a callback;

Fixed Util::count() example;
Fixed Communicator::decodeLength() and Communicator::_decodeLength() docs to include "double".

Author: boenrobot

RELEASE-1.0.0b6

@@ -21,4 +21,5 @@ Util stuff, mostly.
 * Util::find() now works even when the underlying Client streams responses.
 * Util::move()'s second argument $destination is now optional, and without it (or if set to NULL), the item is moved at the bottom of the menu.
 * Client::login() consumes the !done or !fatal response even when called on an already logged in connection.
+* Client::sendAsync() no longer throws an exception if a request is canceled multiple times by the returned value of a callback.
 * The console now checks whether PEAR2_CommandLine is installed, ensuring better error messages when this package is installed without its optional dependencies.

examples/Util/count.php

@@ -15,4 +15,4 @@
 echo $util->count() . "\n";
 
 //Count only disabled ARP items
-echo $util->count(COUNT_NORMAL, RouterOS\Query::where('disabled', 'true')) . "\n";
+echo $util->count(RouterOS\Query::where('disabled', 'true')) . "\n";

src/PEAR2/Net/RouterOS/Client.php

@@ -833,7 +833,13 @@ protected function dispatchNextResponse($sTimeout = 0, $usTimeout = 0)
         if ('' != $tag) {
             if ($this->isRequestActive($tag, self::FILTER_CALLBACK)) {
                 if ($this->callbacks[$tag]($response, $this)) {
-                    $this->cancelRequest($tag);
+                    try {
+                        $this->cancelRequest($tag);
+                    } catch (DataFlowException $e) {
+                        if ($e->getCode() !== DataFlowException::CODE_UNKNOWN_REQUEST) {
+                            throw $e;
+                        }
+                    }
                 } elseif ($isLastForRequest) {
                     unset($this->callbacks[$tag]);
                 }

src/PEAR2/Net/RouterOS/Communicator.php

@@ -624,7 +624,8 @@ public function getNextWordAsStream()
      * @param T\Stream $trans The transmitter from which to decode the length of
      * the incoming message.
      *
-     * @return int The decoded length.
+     * @return int|double The decoded length.
+     *     Is of type "double" only for values above "2 << 31".
      */
     public static function decodeLength(T\Stream $trans)
     {
@@ -649,7 +650,8 @@ public static function decodeLength(T\Stream $trans)
      * @param T\Stream $trans The transmitter from which to decode the length of
      *     the incoming message.
      *
-     * @return int The decoded length.
+     * @return int|double The decoded length.
+     *     Is of type "double" only for values above "2 << 31".
      */
     private static function _decodeLength(T\Stream $trans)
     {

tests/Client/Safe.php

@@ -301,6 +301,25 @@ public function testSendAsyncAndInvalidCancel()
             'Improper active request count after cancel test.'
         );
     }
+    
+    public function testSendAsyncAndMultipleCancelFromCallback()
+    {
+        $printRequest = new Request('/queue/simple/print');
+        $printRequest->setArgument('follow')
+            ->setArgument('.proplist')
+            ->setTag('f');
+        $repliesCount = 0;
+        $this->object->sendAsync(
+            $printRequest,
+            function () use (&$repliesCount) {
+                $repliesCount++;
+                return 1 < $repliesCount && $repliesCount < 6;
+            }
+        );
+        $this->object->loop();
+        $this->assertGreaterThanOrEqual(5, $repliesCount);
+        $this->assertFalse($this->object->isRequestActive('f'));
+    }
 
     public function testSendAsyncAndFullExtract()
     {