Merge pull request #44 from hashworks/bugfix/reverseWhoisParameter

Reverse ircWhois parameters, make server optional
phergie · Jun 8, 2015 · a947bea · a947bea
2 parents c36e277 + 64211de
commit a947bea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/WriteStream.php b/src/WriteStream.php
@@ -427,13 +427,13 @@ public function ircWho($name, $o = null)
     /**
      * Implements \Phergie\Irc\GeneratorInterface->ircWhois().
      *
-     * @param string $server
      * @param string $nickmasks
+     * @param string $server Optional
      * @return string
      */
-    public function ircWhois($server, $nickmasks)
+    public function ircWhois($nickmasks, $server = null)
     {
-        $msg = $this->getGenerator()->ircWhois($server, $nickmasks);
+        $msg = $this->getGenerator()->ircWhois($nickmasks, $server);
         $this->emit('data', array($msg));
         return $msg;
     }

diff --git a/tests/WriteStreamTest.php b/tests/WriteStreamTest.php
@@ -123,7 +123,7 @@ public function getProxyingMethods()
             array('ircPrivmsg', array('receivers', 'text')),
             array('ircNotice', array('nickname', 'text')),
             array('ircWho', array('name', 'o')),
-            array('ircWhois', array('server', 'nickmasks')),
+            array('ircWhois', array('nickmasks', 'server')),
             array('ircWhowas', array('nickname', 'count', 'server')),
             array('ircKill', array('nickname', 'comment')),
             array('ircPing', array('server1', 'server2')),