Added a check for PEAR2_Console_CommandLine in roscon.php;

Added a test for the NotSupporedException from Util::getAll();
CS fixes.

Author: boenrobot

scripts/roscon.php

@@ -125,6 +125,20 @@
     unset($autoloader, $cwd);
 }
 
+//PEAR2_Console_CommandLine is bundled in the archive, but may not be
+//available if this package was installed with a package manager.
+if (!class_exists('PEAR2\Console\CommandLine', true)) {
+    fwrite(
+        STDERR,
+        <<<HEREDOC
+PEAR2_Console_CommandLine was not found.
+Please install it with the package manager used to install PEAR2_Net_RouterOS.
+(i.e. Pyrus, PEAR or Composer)
+HEREDOC
+    );
+    exit(11);
+}
+
 // Locate the data dir, in preference as:
 // 1. The PHP_PEAR_DATA_DIR environment variable, if available
 // 2. The data folder at "mypear" (filled at install time by Pyrus/PEAR)

tests/Client/Safe.php

@@ -427,7 +427,7 @@ function ($response, $client) use (&$repliesCount, &$mark, $limit) {
                         Response::TYPE_DATA,
                         $response->getType(),
                         'Callbacks inside must be of type ' .
-                            Response::TYPE_DATA
+                        Response::TYPE_DATA
                     );
                     return $repliesCount === $limit;
                 } elseif ($response->getType() !== Response::TYPE_DATA) {

tests/Misc/ConnectionlessTest.php

@@ -31,9 +31,9 @@ class ConnectionlessTest extends PHPUnit_Framework_TestCase
     /**
      * @param string $command
      *
-     * @dataProvider providerNonAbsoluteCommand
-     *
      * @return void
+     *
+     * @dataProvider providerNonAbsoluteCommand
      */
     public function testNonAbsoluteCommand($command)
     {
@@ -61,9 +61,9 @@ public function providerNonAbsoluteCommand()
     /**
      * @param string $command
      *
-     * @dataProvider providerUnresolvableCommand
-     *
      * @return void
+     *
+     * @dataProvider providerUnresolvableCommand
      */
     public function testUnresolvableCommand($command)
     {
@@ -89,9 +89,9 @@ public function providerUnresolvableCommand()
     /**
      * @param string $command
      *
-     * @dataProvider providerInvalidCommand
-     *
      * @return void
+     *
+     * @dataProvider providerInvalidCommand
      */
     public function testInvalidCommand($command)
     {
@@ -119,9 +119,9 @@ public function providerInvalidCommand()
      * @param string $command
      * @param string $expected
      *
-     * @dataProvider providerCommandTranslation
-     *
      * @return void
+     *
+     * @dataProvider providerCommandTranslation
      */
     public function testCommandTranslation($command, $expected)
     {
@@ -152,9 +152,9 @@ public function providerCommandTranslation()
      * @param string $expected
      * @param array  $args
      *
-     * @dataProvider providerCommandAndArgumentParsing
-     *
      * @return void
+     *
+     * @dataProvider providerCommandAndArgumentParsing
      */
     public function testCommandAndArgumentParsing($command, $expected, $args)
     {
@@ -593,9 +593,9 @@ public function providerCommandAndArgumentParsing()
      * @param string $command
      * @param int    $code
      *
-     * @dataProvider providerCommandArgumentParsingExceptions
-     *
      * @return void
+     *
+     * @dataProvider providerCommandArgumentParsingExceptions
      */
     public function testCommandArgumentParsingExceptions($command, $code)
     {
@@ -628,9 +628,9 @@ public function providerCommandArgumentParsingExceptions()
     /**
      * @param string $name
      *
-     * @dataProvider providerInvalidArgumentName
-     *
      * @return void
+     *
+     * @dataProvider providerInvalidArgumentName
      */
     public function testInvalidArgumentName($name)
     {
@@ -650,9 +650,9 @@ public function testInvalidArgumentName($name)
     /**
      * @param string $name
      *
-     * @dataProvider providerInvalidArgumentName
-     *
      * @return void
+     *
+     * @dataProvider providerInvalidArgumentName
      */
     public function testInvalidQueryArgumentName($name)
     {
@@ -696,9 +696,9 @@ public function testNonSeekableArgumentValue()
     /**
      * @param string|int $action
      *
-     * @dataProvider providerInvalidQueryArgumentAction
-     *
      * @return void
+     *
+     * @dataProvider providerInvalidQueryArgumentAction
      */
     public function testInvalidQueryArgumentAction($action)
     {
@@ -782,9 +782,9 @@ public function testArgumentRemoval()
      * @param string $expected
      * @param int    $length
      *
-     * @dataProvider providerLengths
-     *
      * @return void
+     *
+     * @dataProvider providerLengths
      */
     public function testLengthEncoding($expected, $length)
     {
@@ -803,9 +803,9 @@ public function testLengthEncoding($expected, $length)
      * @param string $length
      * @param int    $expected
      *
-     * @dataProvider providerLengths
-     *
      * @return void
+     *
+     * @dataProvider providerLengths
      */
     public function testLengthDecoding($length, $expected)
     {
@@ -922,9 +922,9 @@ public function testLengthEncodingExceptions()
     /**
      * @param int $controlByte
      *
-     * @dataProvider providerControlByte
-     *
      * @return void
+     *
+     * @dataProvider providerControlByte
      */
     public function testControlByteException($controlByte)
     {
@@ -992,9 +992,9 @@ public function testPrepareScript()
      * @param string $value
      * @param mixed  $expected
      *
-     * @dataProvider providerUtilParseValue
-     *
      * @return void
+     *
+     * @dataProvider providerUtilParseValue
      */
     public function testUtilParseValue($value, $expected)
     {

tests/Util/Safe.php

@@ -246,4 +246,33 @@ public function testInvalidGetallAndCount()
         $this->assertFalse($this->util->getAll());
         $this->assertCount(-1, $this->util);
     }
+
+    public function providerProhibitedArgs()
+    {
+        return array(
+            0 => array(array('follow')),
+            1 => array(array('follow-only'))
+        );
+    }
+
+    /**
+     * @param array $args Arguments for the Util::getAll() call.
+     *
+     * @return void
+     *
+     * @dataProvider providerProhibitedArgs
+     */
+    public function testGetallArgExceptions(array $args)
+    {
+        $this->util->setMenu('/queue simple');
+        try {
+            $this->util->getAll($args);
+            $this->fail('Supplying these arguments should result in an exception');
+        } catch (NotSupportedException $e) {
+            $this->assertSame(
+                NotSupportedException::CODE_ARG_PROHIBITED,
+                $e->getCode()
+            );
+        }
+    }
 }