Merge branch '11.7' into 11.8

Author: GrahamCampbell

CHANGELOG.md

@@ -15,7 +15,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Implement group merge requests endpoints
 * Implement event endpoints
 
-[11.8.0]: https://github.com/GitLabPHP/Client/compare/11.7.0...11.8.0
+[11.8.0]: https://github.com/GitLabPHP/Client/compare/11.7.1...11.8.0
+
+## [11.7.1] - 2022-04-24
+
+* Fixed `GroupsEpic::all()` method
+* Fixed `Projects::createPipeline()` method
+
+[11.7.1]: https://github.com/GitLabPHP/Client/compare/11.7.0...11.7.1
 
 ## [11.7.0] - 2022-01-24
 

src/Api/AbstractApi.php

@@ -103,10 +103,11 @@ protected function get(string $uri, array $params = [], array $headers = [])
      * @param array<string,mixed>  $params
      * @param array<string,string> $headers
      * @param array<string,string> $files
+     * @param array<string,mixed>  $uriParams
      *
      * @return mixed
      */
-    protected function post(string $uri, array $params = [], array $headers = [], array $files = [])
+    protected function post(string $uri, array $params = [], array $headers = [], array $files = [], array $uriParams = [])
     {
         if (0 < \count($files)) {
             $builder = $this->createMultipartStreamBuilder($params, $files);
@@ -120,7 +121,7 @@ protected function post(string $uri, array $params = [], array $headers = [], ar
             }
         }
 
-        $response = $this->client->getHttpClient()->post(self::prepareUri($uri), $headers, $body);
+        $response = $this->client->getHttpClient()->post(self::prepareUri($uri, $uriParams), $headers, $body);
 
         return ResponseMediator::getContent($response);
     }

src/Api/GroupsEpics.php

@@ -19,7 +19,12 @@ class GroupsEpics extends AbstractApi
     /**
      * @var string
      */
-    public const STATE_ACTIVE = 'active';
+    public const STATE_ALL = 'all';
+
+    /**
+     * @var string
+     */
+    public const STATE_OPENED = 'opened';
 
     /**
      * @var string
@@ -47,7 +52,7 @@ public function all($group_id, array $parameters = [])
             })
         ;
         $resolver->setDefined('state')
-            ->setAllowedValues('state', [self::STATE_ACTIVE, self::STATE_CLOSED])
+            ->setAllowedValues('state', [self::STATE_ALL, self::STATE_OPENED, self::STATE_CLOSED])
         ;
         $resolver->setDefined('search');
 

src/Api/Projects.php

@@ -432,15 +432,15 @@ public function pipelineVariables($project_id, int $pipeline_id)
      */
     public function createPipeline($project_id, string $commit_ref, array $variables = null)
     {
-        $parameters = [
-            'ref' => $commit_ref,
-        ];
+        $parameters = [];
 
         if (null !== $variables) {
             $parameters['variables'] = $variables;
         }
 
-        return $this->post($this->getProjectPath($project_id, 'pipeline'), $parameters);
+        return $this->post($this->getProjectPath($project_id, 'pipeline'), $parameters, [], [], [
+            'ref' => $commit_ref,
+        ]);
     }
 
     /**

tests/Api/ProjectsTest.php

@@ -859,7 +859,7 @@ public function shouldCreatePipeline(): void
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('post')
-            ->with('projects/1/pipeline', ['ref' => 'test-pipeline'])
+            ->with('projects/1/pipeline', [], [], [], ['ref' => 'test-pipeline'])
             ->will($this->returnValue($expectedArray));
 
         $this->assertEquals($expectedArray, $api->createPipeline(1, 'test-pipeline'));
@@ -888,7 +888,7 @@ public function shouldCreatePipelineWithVariables(): void
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('post')
-            ->with('projects/1/pipeline', ['ref' => 'test-pipeline', 'variables' => $variables])
+            ->with('projects/1/pipeline', ['variables' => $variables], [], [], ['ref' => 'test-pipeline'])
             ->will($this->returnValue($expectedArray));
 
         $this->assertEquals($expectedArray, $api->createPipeline(1, 'test-pipeline', $variables));

tests/HttpClient/Message/ResponseMediatorTest.php

@@ -75,12 +75,7 @@ public function testGetErrrorMessageInvalidJson(): void
 
     public function testGetPagination(): void
     {
-        $header = <<<'TEXT'
-<https://example.gitlab.com>; rel="first",
-<https://example.gitlab.com>; rel="next",
-<https://example.gitlab.com>; rel="prev",
-<https://example.gitlab.com>; rel="last",
-TEXT;
+        $header = '<https://example.gitlab.com>; rel="first",<https://example.gitlab.com>; rel="next",<https://example.gitlab.com>; rel="prev",<https://example.gitlab.com>; rel="last"';
 
         $pagination = [
             'first' => 'https://example.gitlab.com',

tests/IntegrationTest.php

@@ -26,7 +26,7 @@ public function testRepoContributors(): void
 
         $response = $client
             ->repositories()
-            ->contributors(5315609);
+            ->contributors(16155465);
 
         $this->assertIsArray($response);
         $this->assertTrue(isset($response[2]));