Reorganized tests:

    - Everything is within a "Test" namespace, eliminating pollution of auto-complete suggestions in IDEs
    - Persistent tests now require PHP >= 5.3.9 (in accordance with PEAR2_Cache_SHM) and are otherwise skipped
    - Connection tests are done for all connection types;
Added Util::comment();
Adjusted Client::login() to consume the !done or !fatal response even when called on an already logged in connection;
Adjusted the RouterOS settings file to add a 1 second delay after the DHCP client call, to ensure proper DNS resolutions down the script;
Using ADH implicitly (without a context) will also explicitly set verify_peer to false, for compatibility with PHP 5.6+;

Author: boenrobot

.gitignore

@@ -1 +1,2 @@
-vendor/
+composer.phar
+vendor/

src/PEAR2/Net/RouterOS/Client.php

@@ -281,9 +281,18 @@ private static function _login(
             )
         );
         $request->send($com);
+
         $response = new Response($com, false, $timeout);
-        return $response->getType() === Response::TYPE_FINAL
-            && null === $response->getProperty('ret');
+        if ($response->getType() === Response::TYPE_FINAL) {
+            return null === $response->getProperty('ret');
+        } else {
+            while ($response->getType() !== Response::TYPE_FINAL
+                && $response->getType() !== Response::TYPE_FATAL
+            ) {
+                $response = new Response($com, false, $timeout);
+            }
+            return false;
+        }
     }
 
     /**

src/PEAR2/Net/RouterOS/Communicator.php

@@ -126,7 +126,15 @@ public function __construct(
             if (!isset($opts['ssl']['ciphers'])
                 || 'DEFAULT' === $opts['ssl']['ciphers']
             ) {
-                stream_context_set_option($context, 'ssl', 'ciphers', 'ADH');
+                stream_context_set_option(
+                    $context,
+                    array(
+                        'ssl' => array(
+                            'ciphers' => 'ADH',
+                            'verify_peer' => false
+                        )
+                    )
+                );
             }
         }
         // @codeCoverageIgnoreStart

src/PEAR2/Net/RouterOS/Util.php

@@ -559,7 +559,10 @@ public function find()
                 $ret = $this->client->sendSync(
                     new Request($this->menu . '/find')
                 )->getProperty('ret');
-                if (!is_string($ret)) {
+                if (null === $ret) {
+                    $this->idCache = array();
+                    return '';
+                } elseif (!is_string($ret)) {
                     $ret = stream_get_contents($ret);
                 }
 

tests/Client/Safe.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PEAR2\Net\RouterOS\Client\Test;
+namespace PEAR2\Net\RouterOS\Test\Client;
 
 use PEAR2\Net\RouterOS\Client;
 use PEAR2\Net\RouterOS\Communicator;

tests/Client/Safe/NonPersistent.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace PEAR2\Net\RouterOS\Client\Test\Safe;
+namespace PEAR2\Net\RouterOS\Test\Client\Safe;
 
-use PEAR2\Net\RouterOS\Client\Test\Safe;
+use PEAR2\Net\RouterOS\Test\Client\Safe;
 
 require_once __DIR__ . '/../Safe.php';
 

tests/Client/Safe/NonPersistent/EncryptedTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace PEAR2\Net\RouterOS\Client\Test\Safe\NonPersistent;
+namespace PEAR2\Net\RouterOS\Test\Client\Safe\NonPersistent;
 
 use PEAR2\Net\RouterOS\Client;
-use PEAR2\Net\RouterOS\Client\Test\Safe\NonPersistent;
+use PEAR2\Net\RouterOS\Test\Client\Safe\NonPersistent;
 use PEAR2\Net\Transmitter\NetworkStream;
 
 require_once __DIR__ . '/../NonPersistent.php';
@@ -15,6 +15,8 @@
  * @group Safe
  * @group NonPersistent
  * @group Encrypted
+ *
+ * @requires extension openssl
  * 
  * @category Net
  * @package  PEAR2_Net_RouterOS

tests/Client/Safe/NonPersistent/UnencryptedTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace PEAR2\Net\RouterOS\Client\Test\Safe\NonPersistent;
+namespace PEAR2\Net\RouterOS\Test\Client\Safe\NonPersistent;
 
 use PEAR2\Net\RouterOS\Client;
-use PEAR2\Net\RouterOS\Client\Test\Safe\NonPersistent;
+use PEAR2\Net\RouterOS\Test\Client\Safe\NonPersistent;
 
 require_once __DIR__ . '/../NonPersistent.php';
 

tests/Client/Safe/Persistent.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace PEAR2\Net\RouterOS\Client\Test\Safe;
+namespace PEAR2\Net\RouterOS\Test\Client\Safe;
 
 use PEAR2\Net\RouterOS\Client;
-use PEAR2\Net\RouterOS\Client\Test;
-use PEAR2\Net\RouterOS\Client\Test\Safe;
+use PEAR2\Net\RouterOS\Test\Client as Test;
+use PEAR2\Net\RouterOS\Test\Client\Safe;
 use PEAR2\Net\RouterOS\Request;
 
 require_once __DIR__ . '/../Safe.php';

tests/Client/Safe/Persistent/EncryptedTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace PEAR2\Net\RouterOS\Client\Test\Safe\Persistent;
+namespace PEAR2\Net\RouterOS\Test\Client\Safe\Persistent;
 
 use PEAR2\Net\RouterOS\Client;
-use PEAR2\Net\RouterOS\Client\Test\Safe\Persistent;
+use PEAR2\Net\RouterOS\Test\Client\Safe\Persistent;
 use PEAR2\Net\Transmitter\NetworkStream;
 
 require_once __DIR__ . '/../Persistent.php';
@@ -15,6 +15,9 @@
  * @group Safe
  * @group Persistent
  * @group Encrypted
+ *
+ * @requires extension openssl
+ * @requires PHP 5.3.9
  * 
  * @category Net
  * @package  PEAR2_Net_RouterOS