Merge branch '9.18' into 9.19

Author: GrahamCampbell

lib/Gitlab/Api/Issues.php

@@ -469,6 +469,17 @@ public function closedByMergeRequests($project_id, $issue_iid)
         return $this->get($this->getProjectPath($project_id, 'issues/'.$this->encodePath($issue_iid)).'/closed_by');
     }
 
+    /**
+     * @param int|string $project_id
+     * @param int        $issue_iid
+     *
+     * @return mixed
+     */
+    public function relatedMergeRequests($project_id, $issue_iid)
+    {
+        return $this->get($this->getProjectPath($project_id, 'issues/'.$this->encodePath($issue_iid).'/related_merge_requests'));
+    }
+
     /**
      * @param int|string $project_id
      * @param int        $issue_iid

lib/Gitlab/Api/Projects.php

@@ -521,6 +521,25 @@ public function boards($project_id)
         return $this->get($this->getProjectPath($project_id, 'boards'));
     }
 
+    /**
+     * Gets a list of all discussion items for a single commit.
+     *
+     * Example:
+     * - https://gitlab.com/gitlab-org/gitlab/-/commit/695c29abcf7dc2eabde8d59869abcea0923ce8fa#note_334686748
+     * - https://gitlab.com/api/v4/projects/gitlab-org%2Fgitlab/repository/commits/695c29abcf7dc2eabde8d59869abcea0923ce8fa/discussions
+     *
+     * @see https://docs.gitlab.com/ee/api/discussions.html#list-project-commit-discussion-items
+     *
+     * @param int|string $project_id
+     * @param string     $commit_id
+     *
+     * @return mixed
+     */
+    public function getRepositoryCommitDiscussions($project_id, $commit_id)
+    {
+        return $this->get($this->getProjectPath($project_id, 'repository/commits/'.$this->encodePath($commit_id)).'/discussions');
+    }
+
     /**
      * @param int|string $project_id
      * @param string     $url

lib/Gitlab/Api/Repositories.php

@@ -168,6 +168,8 @@ public function releases($project_id)
     }
 
     /**
+     * @see https://docs.gitlab.com/ee/api/commits.html#list-repository-commits
+     *
      * @param int|string $project_id
      * @param array      $parameters {
      *
@@ -184,6 +186,9 @@ public function commits($project_id, array $parameters = [])
         $datetimeNormalizer = function (Options $options, \DateTimeInterface $value) {
             return $value->format('c');
         };
+        $booleanNormalizer = function (Options $resolver, $value) {
+            return $value ? 'true' : 'false';
+        };
 
         $resolver->setDefined('path');
         $resolver->setDefined('ref_name');
@@ -195,8 +200,21 @@ public function commits($project_id, array $parameters = [])
             ->setAllowedTypes('until', \DateTimeInterface::class)
             ->setNormalizer('until', $datetimeNormalizer)
         ;
-        $resolver->setDefined('all');
-        $resolver->setDefined('with_stats');
+        $resolver->setDefined('all')
+            ->setAllowedTypes('all', 'bool')
+            ->setNormalizer('all', $booleanNormalizer)
+        ;
+        $resolver->setDefined('with_stats')
+            ->setAllowedTypes('with_stats', 'bool')
+            ->setNormalizer('with_stats', $booleanNormalizer)
+        ;
+        $resolver->setDefined('first_parent')
+            ->setAllowedTypes('first_parent', 'bool')
+            ->setNormalizer('first_parent', $booleanNormalizer)
+        ;
+        $resolver->setDefined('order')
+            ->setAllowedTypes('order', ['default', 'topo'])
+        ;
 
         return $this->get($this->getProjectPath($project_id, 'repository/commits'), $resolver->resolve($parameters));
     }

test/Gitlab/Tests/Api/IssuesTest.php

@@ -601,6 +601,26 @@ public function shouldGetIssueClosedByMergeRequests()
         $this->assertEquals($expectedArray, $api->closedByMergeRequests(1, 2));
     }
 
+    /**
+     * @test
+     */
+    public function shouldGetIssueRelatedMergeRequests()
+    {
+        $expectedArray = [
+            ['id' => 1, 'iid' => '1111', 'title' => 'Just saving the world'],
+            ['id' => 2, 'iid' => '1112', 'title' => 'Adding new feature to get merge requests that close an issue'],
+        ];
+
+        $api = $this->getApiMock();
+        $api->expects($this->once())
+            ->method('get')
+            ->with('projects/1/issues/2/related_merge_requests')
+            ->will($this->returnValue($expectedArray))
+        ;
+
+        $this->assertEquals($expectedArray, $api->relatedMergeRequests(1, 2));
+    }
+
     /**
      * @test
      */

test/Gitlab/Tests/Api/RepositoriesTest.php

@@ -277,7 +277,7 @@ public function shouldGetCommitsWithParams()
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('get')
-            ->with('projects/1/repository/commits', ['page' => 2, 'per_page' => 25, 'ref_name' => 'master', 'all' => true, 'with_stats' => true, 'path' => 'file_path/file_name'])
+            ->with('projects/1/repository/commits', ['page' => 2, 'per_page' => 25, 'ref_name' => 'master', 'all' => 'true', 'with_stats' => 'true', 'path' => 'file_path/file_name'])
             ->will($this->returnValue($expectedArray))
         ;