Merge pull request #12 from hashworks/bugfix/reverseWhoisParameter

Reverse ircWhois parameters, make server optional
phergie · Jun 8, 2015 · 6df0832 · 6df0832
2 parents cf8b2ea + 5055dd6
commit 6df0832
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Generator.php b/src/Generator.php
@@ -380,11 +380,11 @@ public function ircWho($name, $o = null)
     /**
      * Returns a WHOIS message.
      *
-     * @param string $server
      * @param string $nickmasks
+     * @param string $server
      * @return string
      */
-    public function ircWhois($server, $nickmasks)
+    public function ircWhois($nickmasks, $server = null)
     {
         return $this->getIrcMessage('WHOIS', array($server, $nickmasks));
     }

diff --git a/src/GeneratorInterface.php b/src/GeneratorInterface.php
@@ -295,12 +295,12 @@ public function ircWho($name, $o = null);
     /**
      * Returns a WHOIS message.
      *
-     * @param string $server
      * @param string $nickmasks
+     * @param string $server
      * @return string
      * @link https://tools.ietf.org/html/rfc2812#section-4.5.2
      */
-    public function ircWhois($server, $nickmasks);
+    public function ircWhois($nickmasks, $server = null);
 
     /**
      * Returns a WHOWAS message.

diff --git a/tests/GeneratorTest.php b/tests/GeneratorTest.php
@@ -144,7 +144,7 @@ public function dataProviderTestGenerationMethod()
             array('ircWho', "WHO :name\r\n", array('name')),
             array('ircWho', "WHO name :o\r\n", array('name', 'o')),
 
-            array('ircWhois', "WHOIS server :nickmasks\r\n", array('server', 'nickmasks')),
+            array('ircWhois', "WHOIS server :nickmasks\r\n", array('nickmasks', 'server')),
 
             array('ircWhowas', "WHOWAS :nickname\r\n", array('nickname')),
             array('ircWhowas', "WHOWAS nickname :2\r\n", array('nickname', '2')),