Merge pull request #813 from kubawerlos/pull-requests-add-params

Add $params to files from pull request

Author: acrobat

lib/Github/Api/PullRequest.php

@@ -55,17 +55,12 @@ public function configure($bodyType = null, $apiVersion = null)
      *
      * @param string $username   the username
      * @param string $repository the repository
-     * @param array  $params     a list of extra parameters.
+     * @param array  $parameters a list of extra parameters.
      *
      * @return array array of pull requests for the project
      */
-    public function all($username, $repository, array $params = [])
+    public function all($username, $repository, array $parameters = [])
     {
-        $parameters = array_merge([
-            'page' => 1,
-            'per_page' => 30,
-        ], $params);
-
         return $this->get('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls', $parameters);
     }
 
@@ -90,9 +85,9 @@ public function commits($username, $repository, $id)
         return $this->get('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.rawurlencode($id).'/commits');
     }
 
-    public function files($username, $repository, $id)
+    public function files($username, $repository, $id, array $parameters = [])
     {
-        return $this->get('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.rawurlencode($id).'/files');
+        return $this->get('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.rawurlencode($id).'/files', $parameters);
     }
 
     /**

test/Github/Tests/Api/PullRequestTest.php

@@ -32,7 +32,7 @@ public function shouldGetOpenPullRequests()
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('get')
-            ->with('/repos/ezsystems/ezpublish/pulls', ['state' => 'open', 'per_page' => 30, 'page' => 1])
+            ->with('/repos/ezsystems/ezpublish/pulls', ['state' => 'open'])
             ->will($this->returnValue($expectedArray));
 
         $this->assertEquals($expectedArray, $api->all('ezsystems', 'ezpublish', ['state' => 'open']));
@@ -48,7 +48,7 @@ public function shouldGetClosedPullRequests()
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('get')
-            ->with('/repos/ezsystems/ezpublish/pulls', ['state' => 'closed', 'per_page' => 30, 'page' => 1])
+            ->with('/repos/ezsystems/ezpublish/pulls', ['state' => 'closed'])
             ->will($this->returnValue($expectedArray));
 
         $this->assertEquals($expectedArray, $api->all('ezsystems', 'ezpublish', ['state' => 'closed']));
@@ -103,6 +103,22 @@ public function shouldShowFilesFromPullRequest()
         $this->assertEquals($expectedArray, $api->files('ezsystems', 'ezpublish', '15'));
     }
 
+    /**
+     * @test
+     */
+    public function shouldShowFilesFromPullRequestForPage()
+    {
+        $expectedArray = [['id' => 'id', 'sha' => '123123']];
+
+        $api = $this->getApiMock();
+        $api->expects($this->once())
+            ->method('get')
+            ->with('/repos/ezsystems/ezpublish/pulls/15/files', ['page' => 2, 'per_page' => 30])
+            ->willReturn($expectedArray);
+
+        $this->assertSame($expectedArray, $api->files('ezsystems', 'ezpublish', '15', ['page' => 2, 'per_page' => 30]));
+    }
+
     /**
      * @test
      */
@@ -211,10 +227,10 @@ public function shouldMergePullRequestWithMergeMethod()
     public function shouldCreatePullRequestUsingTitle()
     {
         $data = [
-            'base' => 'master',
-            'head' => 'virtualtestbranch',
+            'base'  => 'master',
+            'head'  => 'virtualtestbranch',
             'title' => 'TITLE: Testing pull-request creation from PHP Github API',
-            'body' => 'BODY: Testing pull-request creation from PHP Github API',
+            'body'  => 'BODY: Testing pull-request creation from PHP Github API',
         ];
 
         $api = $this->getApiMock();
@@ -231,8 +247,8 @@ public function shouldCreatePullRequestUsingTitle()
     public function shouldCreatePullRequestUsingIssueId()
     {
         $data = [
-            'base' => 'master',
-            'head' => 'virtualtestbranch',
+            'base'  => 'master',
+            'head'  => 'virtualtestbranch',
             'issue' => 25,
         ];
 
@@ -251,9 +267,9 @@ public function shouldNotCreatePullRequestWithoutBase()
     {
         $this->expectException(MissingArgumentException::class);
         $data = [
-            'head' => 'virtualtestbranch',
+            'head'  => 'virtualtestbranch',
             'title' => 'TITLE: Testing pull-request creation from PHP Github API',
-            'body' => 'BODY: Testing pull-request creation from PHP Github API',
+            'body'  => 'BODY: Testing pull-request creation from PHP Github API',
         ];
 
         $api = $this->getApiMock();
@@ -270,9 +286,9 @@ public function shouldNotCreatePullRequestWithoutHead()
     {
         $this->expectException(MissingArgumentException::class);
         $data = [
-            'base' => 'master',
+            'base'  => 'master',
             'title' => 'TITLE: Testing pull-request creation from PHP Github API',
-            'body' => 'BODY: Testing pull-request creation from PHP Github API',
+            'body'  => 'BODY: Testing pull-request creation from PHP Github API',
         ];
 
         $api = $this->getApiMock();
@@ -289,8 +305,8 @@ public function shouldNotCreatePullRequestUsingTitleButWithoutBody()
     {
         $this->expectException(MissingArgumentException::class);
         $data = [
-            'base' => 'master',
-            'head' => 'virtualtestbranch',
+            'base'  => 'master',
+            'head'  => 'virtualtestbranch',
             'title' => 'TITLE: Testing pull-request creation from PHP Github API',
         ];