Removed deprecated "strict" option from phpunit.xml;

Fixed testSendAsyncWithCallbackAndCancelWithin(), which should allow for additional data replies, as long as it ends with an error reply, followed by a final reply.

Author: boenrobot

docs/wiki

@@ -401,9 +401,10 @@ public function testSendAsyncWithCallbackAndCancelWithin()
             ->setArgument('interval', '0.5')
             ->setTag('ping');
         $repliesCount = 0;
+        $mark = array();
         $this->object->sendAsync(
             $ping,
-            function ($response, $client) use (&$repliesCount, $limit) {
+            function ($response, $client) use (&$repliesCount, &$mark, $limit) {
                 PHPUnit_Framework_TestCase::assertInstanceOf(
                     ROS_NAMESPACE . '\Response',
                     $response,
@@ -421,12 +422,27 @@ function ($response, $client) use (&$repliesCount, $limit) {
                     'The callback must only receive responses meant for it.'
                 );
                 $repliesCount++;
-                return $repliesCount === $limit;
+                if ($repliesCount <= $limit) {
+                    PHPUnit_Framework_TestCase::assertEquals(
+                        Response::TYPE_DATA,
+                        $response->getType(),
+                        'Callbacks inside must be of type ' .
+                            Response::TYPE_DATA
+                    );
+                    return $repliesCount === $limit;
+                } elseif ($response->getType() !== Response::TYPE_DATA) {
+                    $mark[] = $response->getType();
+                }
             }
         );
 
         $this->object->loop();
-        $this->assertEquals(
+        $this->assertSame(
+            array(Response::TYPE_ERROR, Response::TYPE_FINAL),
+            $mark,
+            print_r($mark, true)
+        );
+        $this->assertGreaterThanOrEqual(
             $limit + 2/* The !trap and !done*/,
             $repliesCount,
             "Extra callbacks were executed during second loop."

tests/Client/Safe.php

@@ -22,7 +22,7 @@ abstract class Unsafe extends PHPUnit_Framework_TestCase
 
     /**
      * Runs the test in a separate process for the sake of
-     * peristent connections.
+     * persistent connections.
      *
      * @runInSeparateProcess
      *
@@ -33,7 +33,7 @@ public function testSystemReboot()
         $this->object->sendSync(new Request('/system/reboot'));
         $this->object->close();
         $this->object = null;
-        sleep(1);
+        sleep(2);
         while (true) {
             try {
                 $this->object = new Client(\HOSTNAME, USERNAME, PASSWORD, PORT);

tests/Client/Unsafe.php

@@ -9,9 +9,7 @@
 use PEAR2\Net\RouterOS\LengthException;
 use PEAR2\Net\RouterOS\NotSupportedException;
 use PEAR2\Net\RouterOS\Query;
-use PEAR2\Net\RouterOS\Registry;
 use PEAR2\Net\RouterOS\Request;
-use PEAR2\Net\RouterOS\Response;
 use PEAR2\Net\RouterOS\UnexpectedValueException;
 use PEAR2\Net\RouterOS\Util;
 use PEAR2\Net\Transmitter as T;
@@ -686,7 +684,7 @@ public function providerInvalidArgumentName()
 
     public function testNonSeekableArgumentValue()
     {
-        $value = fopen('php://input', 'r');
+        $value = fopen('php://output', 'a');
         $request = new Request('/ping');
         $request->setArgument('address', $value);
         $actual = $request->getArgument('address');
@@ -735,7 +733,7 @@ public function providerInvalidQueryArgumentAction()
 
     public function testNonSeekableCommunicatorWord()
     {
-        $value = fopen('php://input', 'r');
+        $value = fopen('php://output', 'a');
         $com = new Communicator(HOSTNAME, PORT);
         Client::login($com, USERNAME, PASSWORD);
         try {
@@ -752,7 +750,7 @@ public function testNonSeekableCommunicatorWord()
 
     public function testNonSeekableQueryArgumentValue()
     {
-        $value = fopen('php://input', 'r');
+        $value = fopen('php://output', 'a');
         $stringValue = (string) $value;
         $query1 = Query::where('address', $stringValue);
         $query2 = Query::where('address', $value);

tests/Misc/ConnectionlessTest.php

@@ -4,7 +4,6 @@
     colors="false"
     stopOnFailure="true"
     verbose="true"
-    strict="true"
 
     convertErrorsToExceptions="true"
     convertNoticesToExceptions="true"