Added search functionality to API for: issues, repos, users

Author: stloyd

lib/Github/Api/Issue.php

@@ -18,7 +18,7 @@ class Issue extends Api
      * @param   string  $username         the username
      * @param   string  $repo             the repo
      * @param   string  $state            the issue state, can be open or closed
-     * @param   array  $state             the additional parameters like milestone, assignee, lables, sort, direction
+     * @param   array   $parameters       the additional parameters like milestone, assignee, lables, sort, direction
      * @return  array                     list of issues found
      */
     public function getList($username, $repo, $state = null, $parameters = array())
@@ -35,17 +35,23 @@ public function getList($username, $repo, $state = null, $parameters = array())
     }
 
     /**
-     * Search issues by username, repo, state and search term
+     * Search issues by username, repo, state and keyword
+     * @link http://developer.github.com/v3/search/#search-issues
      *
      * @param   string  $username         the username
      * @param   string  $repo             the repo
      * @param   string  $state            the issue state, can be open or closed
-     * @param   string  $searchTerm       the search term to filter issues by
+     * @param   string  $keyword          the keyword to filter issues by
+     *
      * @return  array                     list of issues found
      */
-    public function search($username, $repo, $state, $searchTerm)
+    public function search($username, $repo, $state, $keyword)
     {
-        throw new \BadMethodCallException('Method cannot be implemented using new api version');
+        if (!in_array($state, array('open', 'closed'))) {
+            $state = 'open';
+        }
+
+        return $this->get('legacy/issues/search/'.urlencode($username).'/'.urlencode($repo).'/'.urlencode($state).'/'.urlencode($keyword));
     }
 
     /**
@@ -125,7 +131,7 @@ public function update($username, $repo, $number, array $data)
     }
 
     /**
-     * Repoen an existing issue by username, repo and issue number. Requires authentication.
+     * Reopen an existing issue by username, repo and issue number. Requires authentication.
      * @link http://developer.github.com/v3/issues/
      *
      * @param   string  $username         the username

lib/Github/Api/Repo.php

@@ -13,17 +13,32 @@
 class Repo extends Api
 {
     /**
-     * Search repos by keyword
-     * http://develop.github.com/p/repo.html
+     * Search repositories by keyword:
+     * @link http://developer.github.com/v3/search/#search-repositories
      *
-     * @param   string  $query            the search query
+     * @param   string  $keyword          the search query
      * @param   string  $language         takes the same values as the language drop down on http://github.com/search
-     * @param   int     $startPage        the page number
-     * @return  array                     list of repos found
+     * @param   integer $startPage        the page number
+     *
+     * @return  array                     list of founded repositories
      */
-    public function search($query, $language = '', $startPage = 1)
+    public function search($keyword, $language = null, $startPage = 1)
     {
-        throw new \BadMethodCallException('Method cannot be implemented using new api version');
+        $url = 'legacy/repos/search/'.urlencode($keyword);
+
+        $params = array();
+        if (null !== $language) {
+            $params['language'] = $language;
+        }
+        if (1 !== $startPage) {
+            $params['start_page'] = $startPage;
+        }
+
+        if (!empty($params)) {
+            $url .= '?' . http_build_query($params);
+        }
+
+        return $this->get($url);
     }
 
     /**
@@ -363,7 +378,7 @@ public function getRepoTeams($username, $repo)
      *
      * @param   string  $username         the user who owns the repo
      * @param   string  $repo             the name of the repo
-     * @param           $path             path to file or directory
+     * @param   string  $path             path to file or directory
      *
      * @return array                      information for file | information for each item in directory
      */

lib/Github/Api/User.php

@@ -13,15 +13,16 @@
 class User extends Api
 {
     /**
-     * Search users by username
-     * http://develop.github.com/p/users.html#searching_for_users
+     * Search users by username:
+     * @link http://developer.github.com/v3/search/#search-users
      *
-     * @param   string  $username         the username to search
-     * @return  array                     list of users found
+     * @param  string $keyword the keyword to search
+     *
+     * @return array           list of users found
      */
-    public function search($username)
+    public function search($keyword)
     {
-        throw new \BadMethodCallException('Method cannot be implemented using new api version');
+        return $this->get('legacy/user/search/'.urlencode($keyword));
     }
 
     /**

test/Github/Tests/Api/RepoTest.php

@@ -6,16 +6,6 @@
 
 class RepoTest extends ApiTestCase
 {
-    /**
-     * @expectedException BadMethodCallException
-     */
-    public function testThatSearchIsNotSupported()
-    {
-        $api = $this->getApiMock();
-
-        $api->search('github api', 'fr', 3);
-    }
-
     /**
      * @expectedException BadMethodCallException
      */