Change the way GET request is build, fix pagination parameter

Author: cursedcoder

lib/Github/HttpClient/CachedHttpClient.php

@@ -61,9 +61,9 @@ public function request($path, array $parameters = array(), $httpMethod = 'GET',
      *
      * {@inheritdoc}
      */
-    protected function createRequest($httpMethod, $path, $requestBody, array $headers = array())
+    protected function createRequest($httpMethod, $path, array $parameters = array(), array $headers = array())
     {
-        $request = parent::createRequest($httpMethod, $path, $requestBody, $headers = array());
+        $request = parent::createRequest($httpMethod, $path, $parameters, $headers = array());
 
         if ($modifiedAt = $this->getCache()->getModifiedSince($path)) {
             $modifiedAt = new \DateTime('@'.$modifiedAt);

lib/Github/HttpClient/HttpClient.php

@@ -43,7 +43,7 @@ class HttpClient implements HttpClientInterface
     public function __construct(array $options = array(), ClientInterface $client = null)
     {
         $this->options = array_merge($this->options, $options);
-	$client = $client ?: new GuzzleClient($this->options['base_url'], $this->options);
+        $client = $client ?: new GuzzleClient($this->options['base_url'], $this->options);
         $this->client  = $client;
 
         $this->addListener('request.error', array(new ErrorListener($this->options), 'onRequestError'));
@@ -127,11 +127,7 @@ public function put($path, array $parameters = array(), array $headers = array()
      */
     public function request($path, array $parameters = array(), $httpMethod = 'GET', array $headers = array())
     {
-        $requestBody = count($parameters) === 0
-            ? null : json_encode($parameters, empty($parameters) ? JSON_FORCE_OBJECT : 0)
-        ;
-
-        $request = $this->createRequest($httpMethod, $path, $requestBody, $headers);
+        $request = $this->createRequest($httpMethod, $path, $parameters, $headers);
         $request->addHeaders($headers);
 
         try {
@@ -174,8 +170,24 @@ public function getLastResponse()
         return $this->lastResponse;
     }
 
-    protected function createRequest($httpMethod, $path, $requestBody, array $headers = array())
+    protected function createRequest($httpMethod, $path, array $parameters = array(), array $headers = array())
     {
-        return $this->client->createRequest($httpMethod, $path, array_merge($this->headers, $headers), $requestBody);
+        if ('GET' !== $httpMethod) {
+            $requestBody = count($parameters) === 0
+                ? null : json_encode($parameters, empty($parameters) ? JSON_FORCE_OBJECT : 0)
+            ;
+            $options = array();
+        } else {
+            $requestBody = null;
+            $options = array('query' => $parameters);
+        }
+
+        return $this->client->createRequest(
+            $httpMethod,
+            $path,
+            array_merge($this->headers, $headers),
+            $requestBody,
+            $options
+        );
     }
 }

test/Github/Tests/Functional/ResultPagerTest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Github\Tests\Functional;
+
+use Github\ResultPager;
+
+/**
+ * @group functional
+ */
+class ResultPagerTest extends TestCase
+{
+    /**
+     * @test
+     */
+    public function shouldPaginateGetRequests()
+    {
+        $repositoriesApi = $this->client->api('user');
+        $repositoriesApi->setPerPage(10);
+
+        $pager = new ResultPager($this->client);
+
+        $repositories = $pager->fetch($repositoriesApi, 'repositories', array('KnpLabs'));
+        $this->assertCount(10, $repositories);
+
+        $repositoriesApi->setPerPage(20);
+        $repositories = $pager->fetch($repositoriesApi, 'repositories', array('KnpLabs'));
+        $this->assertCount(20, $repositories);
+    }
+}

test/Github/Tests/Functional/TestCase.php

@@ -15,6 +15,7 @@ class TestCase extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
+        // You have to specify authentication here to run full suite
         $client = new Client();
 
         try {