Merge branch '10.3' into 11.0

Author: GrahamCampbell

CHANGELOG.md

@@ -10,13 +10,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Removed models API
 * Bumped min PHP to 7.2.5
 
-[11.0.0-RC1]: https://github.com/GitLabPHP/Client/compare/10.2.0...11.0.0-RC1
+[11.0.0-RC1]: https://github.com/GitLabPHP/Client/compare/10.3.0...11.0.0-RC1
+
+## [10.3.0] - UPCOMING
+
+[10.3.0]: https://github.com/GitLabPHP/Client/compare/10.2.0...10.3.0
 
 ## [10.2.0] - UPCOMING
 
 * Added variable_type to addVariable and updateVariable
+* Added get pipeline bridget jobs method
+
+[10.2.0]: https://github.com/GitLabPHP/Client/compare/10.1.2...10.2.0
+
+## [10.1.2] - 2020-11-09
+
+* Fixed comparing repositories
 
-[10.2.0]: https://github.com/GitLabPHP/Client/compare/10.1.1...10.2.0
+[10.1.2]: https://github.com/GitLabPHP/Client/compare/10.1.1...10.1.2
 
 ## [10.1.1] - 2020-10-26
 

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.0.1@b1e2e30026936ef8d5bf6a354d1c3959b6231f44">
+<files psalm-version="4.1.1@16bfbd9224698bd738c665f33039fade2a1a3977">
   <file src="src/Api/AbstractApi.php">
     <InvalidArgument occurrences="1"/>
   </file>

src/Api/Jobs.php

@@ -87,6 +87,27 @@ public function pipelineJobs($project_id, int $pipeline_id, array $parameters =
         );
     }
 
+    /**
+     * @param int|string $project_id
+     * @param int        $pipeline_id
+     * @param array      $parameters  {
+     *
+     *     @var string|string[] $scope The scope of bridge jobs to show, one or array of: created, pending, running, failed,
+     *                                 success, canceled, skipped, manual; showing all jobs if none provided.
+     * }
+     *
+     * @return mixed
+     */
+    public function pipelineBridges($project_id, int $pipeline_id, array $parameters = [])
+    {
+        $resolver = $this->createOptionsResolver();
+
+        return $this->get(
+            $this->getProjectPath($project_id, 'pipelines/').self::encodePath($pipeline_id).'/bridges',
+            $resolver->resolve($parameters)
+        );
+    }
+
     /**
      * @param int|string $project_id
      * @param int        $job_id

src/Api/MergeRequests.php

@@ -115,6 +115,12 @@ public function all($project_id = null, array $parameters = [])
         $resolver->setDefined('with_merge_status_recheck')
             ->setAllowedTypes('with_merge_status_recheck', 'bool')
         ;
+        $resolver->setDefined('approved_by_ids')
+            ->setAllowedTypes('approved_by_ids', 'array')
+            ->setAllowedValues('approved_by_ids', function (array $value) {
+                return \count($value) === \count(\array_filter($value, 'is_int'));
+            })
+        ;
 
         $path = null === $project_id ? 'merge_requests' : $this->getProjectPath($project_id, 'merge_requests');
 

tests/Api/JobsTest.php

@@ -53,6 +53,28 @@ public function shouldGetPipelineJobs(): void
         $this->assertEquals($expectedArray, $api->pipelineJobs(1, 2, ['scope' => [Jobs::SCOPE_PENDING, Jobs::SCOPE_RUNNING]]));
     }
 
+    /**
+     * @test
+     */
+    public function shouldGetPipelineBridges(): void
+    {
+        $expectedArray = [
+            ['id' => 1, 'name' => 'A bridge job'],
+            ['id' => 2, 'name' => 'Another bridge job'],
+        ];
+
+        $api = $this->getApiMock();
+        $api->expects($this->once())
+            ->method('get')
+            ->with('projects/1/pipelines/2/bridges', [
+                'scope' => ['pending', 'running'],
+            ])
+            ->will($this->returnValue($expectedArray))
+        ;
+
+        $this->assertEquals($expectedArray, $api->pipelineBridges(1, 2, ['scope' => [Jobs::SCOPE_PENDING, Jobs::SCOPE_RUNNING]]));
+    }
+
     /**
      * @test
      */

tests/Api/MergeRequestsTest.php

@@ -66,6 +66,7 @@ public function shouldGetAllWithParams(): void
                 'source_branch' => 'develop',
                 'target_branch' => 'master',
                 'with_merge_status_recheck' => true,
+                'approved_by_ids' => [1],
             ])
             ->will($this->returnValue($expectedArray))
         ;
@@ -84,6 +85,7 @@ public function shouldGetAllWithParams(): void
             'source_branch' => 'develop',
             'target_branch' => 'master',
             'with_merge_status_recheck' => true,
+            'approved_by_ids' => [1],
         ]));
     }
 

vendor-bin/phpstan/composer.json

@@ -1,11 +1,11 @@
 {
     "require": {
-        "php": "^7.2.5",
-        "phpstan/phpstan": "~0.12.51",
+        "php": "^7.2.5 || ^8.0",
+        "phpstan/phpstan": "~0.12.54",
         "phpstan/phpstan-deprecation-rules": "~0.12.5",
         "phpstan/phpstan-strict-rules": "~0.12.5",
         "thecodingmachine/phpstan-strict-rules": "~0.12.1",
-        "ergebnis/phpstan-rules": "~0.15.2"
+        "ergebnis/phpstan-rules": "~0.15.3"
     },
     "config": {
         "preferred-install": "dist"

vendor-bin/phpunit/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
-        "php": "^7.2.5",
-        "phpunit/phpunit": "^8.5.8 || ^9.3.7"
+        "php": "^7.2.5 || ^8.0",
+        "phpunit/phpunit": "^8.5.8 || ^9.4.2"
     },
     "config": {
         "preferred-install": "dist"

vendor-bin/psalm/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
-        "php": "^7.3",
-        "psalm/phar": "~4.0.1"
+        "php": "^7.2.5 || ^8.0",
+        "psalm/phar": "~4.1.1"
     },
     "config": {
         "preferred-install": "dist"

vendor-bin/rector/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.2.5",
-        "rector/rector-prefixed": "0.8.42"
+        "rector/rector-prefixed": "0.8.48"
     },
     "config": {
         "preferred-install": "dist"