Merge branch '2.x'

* 2.x:
  Update branch alias
  feature #938 Add parameters to PullRequest commits method (seanmtaylor)

Author: acrobat

composer.json

@@ -47,7 +47,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-2.x": "2.17.x-dev",
+            "dev-2.x": "2.18.x-dev",
             "dev-master": "3.0.x-dev"
         }
     }

lib/Github/Api/PullRequest.php

@@ -80,9 +80,9 @@ public function show($username, $repository, $id)
         return $this->get('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.$id);
     }
 
-    public function commits($username, $repository, $id)
+    public function commits($username, $repository, $id, array $parameters = [])
     {
-        return $this->get('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.rawurlencode($id).'/commits');
+        return $this->get('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.rawurlencode($id).'/commits', $parameters);
     }
 
     public function files($username, $repository, $id, array $parameters = [])

test/Github/Tests/Api/PullRequestTest.php

@@ -87,6 +87,22 @@ public function shouldShowCommitsFromPullRequest()
         $this->assertEquals($expectedArray, $api->commits('ezsystems', 'ezpublish', '15'));
     }
 
+    /**
+     * @test
+     */
+    public function shouldShowCommitsFromPullRequestForPage()
+    {
+        $expectedArray = [['id' => 'id', 'sha' => '123123']];
+
+        $api = $this->getApiMock();
+        $api->expects($this->once())
+            ->method('get')
+            ->with('/repos/ezsystems/ezpublish/pulls/15/commits', ['page' => 2, 'per_page' => 30])
+            ->willReturn($expectedArray);
+
+        $this->assertEquals($expectedArray, $api->commits('ezsystems', 'ezpublish', '15', ['page' => 2, 'per_page' => 30]));
+    }
+
     /**
      * @test
      */