Made Util::setMenu() work for any relative paths that resolve to the root menu;

Added tests for that and for ResponseCollection::\_invoke() without arguments.

Author: boenrobot

src/PEAR2/Net/RouterOS/Util.php

@@ -123,10 +123,14 @@ public function setMenu($newMenu)
             } elseif ('/' === $newMenu[0]) {
                 $this->menu = $menuRequest->setCommand($newMenu)->getCommand();
             } else {
-                $this->menu = $menuRequest->setCommand(
-                    '/' . str_replace('/', ' ', substr($this->menu, 1)) . ' ' .
-                    str_replace('/', ' ', $newMenu)
-                )->getCommand();
+                $this->menu = '/' . substr(
+                    $menuRequest->setCommand(
+                        '/' . str_replace('/', ' ', substr($this->menu, 1)) .
+                        ' ' . str_replace('/', ' ', $newMenu) . ' ?'
+                    )->getCommand(),
+                    1,
+                    -2/*strlen('/?')*/
+                );
             }
         }
         $this->clearIdCache();

tests/Client/Safe.php

@@ -764,6 +764,7 @@ public function testClientInvokability()
         $this->assertEquals(count($arpResponses1), count($arpResponses2));
         $this->assertEquals(count($arpResponses2), count($arpResponses3));
         $this->assertInstanceOf(ROS_NAMESPACE . '\Response', $arpResponses1(0));
+        $this->assertInstanceOf('ArrayObject', $arpResponses1());
     }
 
     public function testStreamEquality()

tests/Util/Safe.php

@@ -34,6 +34,18 @@ public function testSetGetMenu()
             '/queue',
             $this->util->setMenu('queue')->getMenu()
         );
+        $this->assertSame(
+            '/',
+            $this->util->setMenu('..')->getMenu()
+        );
+        $this->assertSame(
+            '/',
+            $this->util->setMenu('queue ..')->getMenu()
+        );
+        $this->assertSame(
+            '/queue',
+            $this->util->setMenu('/queue')->getMenu()
+        );
         $this->assertSame(
             '/queue/simple',
             $this->util->setMenu('simple')->getMenu()