Merge branch 'master' into master

Author: thomxc

README.md

@@ -99,7 +99,7 @@ You get the idea! Take a look around ([API methods](https://github.com/m4tthumph
 Framework Integrations
 ----------------------
 - **Symfony** - https://github.com/Zeichen32/GitLabApiBundle
-- **Laravel** - https://github.com/vinkla/laravel-gitlab
+- **Laravel** - https://github.com/GrahamCampbell/Laravel-GitLab
 
 If you have integrated GitLab into a popular PHP framework, let us know!
 

composer.json

@@ -23,7 +23,7 @@
 	"require": {
 		"php": "^5.6 || ^7.0",
 		"ext-xml": "*",
-		"php-http/client-common": "^1.5",
+		"php-http/client-common": "^1.6",
 		"php-http/client-implementation": "^1.0",
 		"php-http/discovery": "^1.2",
 		"php-http/httplug": "^1.1",
@@ -34,7 +34,7 @@
 		"guzzlehttp/psr7": "^1.2",
 		"php-http/guzzle6-adapter": "^1.0",
 		"php-http/mock-client": "^1.0",
-		"phpunit/phpunit": "~4.5"
+		"phpunit/phpunit": "^5.0"
 	},
 	"autoload": {
 		"psr-4": { "Gitlab\\": "lib/Gitlab/" }
@@ -44,7 +44,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "9.0.x-dev"
+			"dev-master": "9.8.x-dev"
 		}
 	}
 }

doc/customize.md

@@ -21,7 +21,7 @@ As timeout configuration is not compatible with HTTP client abstraction, you hav
 an explicit HTTP client implementation.
 
 ```php
-$httpClient = Http\Adapter\Guzzle6::createWithConfig([
+$httpClient = Http\Adapter\Guzzle6\Client::createWithConfig([
     'timeout' => 1.0
 ]);
 $client = Gitlab\Client::createWithHttpClient($httpClient);

lib/Gitlab/Api/AbstractApi.php

@@ -8,6 +8,7 @@
 use Http\Message\MultipartStream\MultipartStreamBuilder;
 use Http\Message\StreamFactory;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -89,7 +90,7 @@ protected function post($path, array $parameters = array(), $requestHeaders = ar
 
         $body = null;
         if (empty($files) && !empty($parameters)) {
-            $body = $this->streamFactory->createStream(QueryStringBuilder::build($parameters));
+            $body = $this->prepareBody($parameters);
             $requestHeaders['Content-Type'] = 'application/x-www-form-urlencoded';
         } elseif (!empty($files)) {
             $builder = new MultipartStreamBuilder($this->streamFactory);
@@ -128,7 +129,7 @@ protected function put($path, array $parameters = array(), $requestHeaders = arr
 
         $body = null;
         if (!empty($parameters)) {
-            $body = $this->streamFactory->createStream(http_build_query($parameters));
+            $body = $this->prepareBody($parameters);
             $requestHeaders['Content-Type'] = 'application/x-www-form-urlencoded';
         }
 
@@ -197,6 +198,18 @@ protected function createOptionsResolver()
         return $resolver;
     }
 
+    /**
+     * @param array $parameters
+     * @return StreamInterface
+     */
+    private function prepareBody(array $parameters = [])
+    {
+        $raw = QueryStringBuilder::build($parameters);
+        $stream = $this->streamFactory->createStream($raw);
+
+        return $stream;
+    }
+
     private function preparePath($path, array $parameters = [])
     {
         if (count($parameters) > 0) {

lib/Gitlab/Api/Environments.php

@@ -45,4 +45,14 @@ public function remove($project_id, $environment_id)
     {
         return $this->delete($this->getProjectPath($project_id, 'environments/' . $environment_id));
     }
+
+    /**
+     * @param int $project_id
+     * @param string $environment_id
+     * @return mixed
+     */
+    public function stop($project_id, $environment_id)
+    {
+        return $this->post($this->getProjectPath($project_id, 'environments/'.$this->encodePath($environment_id).'/stop'));
+    }
 }

lib/Gitlab/Api/Groups.php

@@ -1,5 +1,7 @@
 <?php namespace Gitlab\Api;
 
+use Symfony\Component\OptionsResolver\Options;
+
 class Groups extends AbstractApi
 {
     /**
@@ -17,36 +19,7 @@ class Groups extends AbstractApi
      */
     public function all(array $parameters = [])
     {
-        $resolver = $this->createOptionsResolver();
-        $booleanNormalizer = function ($value) {
-            return $value ? 'true' : 'false';
-        };
-
-        $resolver->setDefined('skip_groups')
-            ->setAllowedTypes('skip_groups', 'array')
-            ->setAllowedValues('skip_groups', function (array $value) {
-                return count($value) == count(array_filter($value, 'is_int'));
-            })
-        ;
-        $resolver->setDefined('all_available')
-            ->setAllowedTypes('all_available', 'bool')
-            ->setNormalizer('all_available', $booleanNormalizer)
-        ;
-        $resolver->setDefined('search');
-        $resolver->setDefined('order_by')
-            ->setAllowedValues('order_by', ['name', 'path'])
-        ;
-        $resolver->setDefined('sort')
-            ->setAllowedValues('sort', ['asc', 'desc'])
-        ;
-        $resolver->setDefined('statistics')
-            ->setAllowedTypes('statistics', 'bool')
-            ->setNormalizer('statistics', $booleanNormalizer)
-        ;
-        $resolver->setDefined('owned')
-            ->setAllowedTypes('owned', 'bool')
-            ->setNormalizer('owned', $booleanNormalizer)
-        ;
+        $resolver = $this->getGroupSearchResolver();
 
         return $this->get('groups', $resolver->resolve($parameters));
     }
@@ -65,16 +38,26 @@ public function show($id)
      * @param string $path
      * @param string $description
      * @param string $visibility
+     * @param bool   $lfs_enabled
+     * @param bool   $request_access_enabled
+     * @param int    $parent_id
+     * @param int    $shared_runners_minutes_limit
      * @return mixed
      */
-    public function create($name, $path, $description = null, $visibility = 'private')
+    public function create($name, $path, $description = null, $visibility = 'private', $lfs_enabled = null, $request_access_enabled = null, $parent_id = null, $shared_runners_minutes_limit = null)
     {
-        return $this->post('groups', array(
+        $params = array(
             'name' => $name,
             'path' => $path,
             'description' => $description,
             'visibility' => $visibility,
-        ));
+            'lfs_enabled' => $lfs_enabled,
+            'request_access_enabled' => $request_access_enabled,
+            'parent_id' => $parent_id,
+            'shared_runners_minutes_limit' => $shared_runners_minutes_limit,
+        );
+
+        return $this->post('groups', array_filter($params, 'strlen'));
     }
 
     /**
@@ -180,7 +163,7 @@ public function removeMember($group_id, $user_id)
     public function projects($id, array $parameters = [])
     {
         $resolver = $this->createOptionsResolver();
-        $booleanNormalizer = function ($value) {
+        $booleanNormalizer = function (Options $resolver, $value) {
             return $value ? 'true' : 'false';
         };
 
@@ -213,4 +196,61 @@ public function projects($id, array $parameters = [])
 
         return $this->get('groups/'.$this->encodePath($id).'/projects', $resolver->resolve($parameters));
     }
+
+    /**
+     * @param int $groupId
+     * @param array $parameters (
+     *
+     *     @var int[]  $skip_groups   Skip the group IDs passes.
+     *     @var bool   $all_available Show all the groups you have access to.
+     *     @var string $search        Return list of authorized groups matching the search criteria.
+     *     @var string $order_by      Order groups by name or path. Default is name.
+     *     @var string $sort          Order groups in asc or desc order. Default is asc.
+     *     @var bool   $statistics    Include group statistics (admins only).
+     *     @var bool   $owned         Limit by groups owned by the current user.
+     * )
+     * @return mixed
+     */
+    public function subgroups($groupId, array $parameters = [])
+    {
+        $resolver = $this->getGroupSearchResolver();
+
+        return $this->get('groups/'.$this->encodePath($groupId).'/subgroups', $resolver->resolve($parameters));
+    }
+
+    private function getGroupSearchResolver()
+    {
+        $resolver = $this->createOptionsResolver();
+        $booleanNormalizer = function (Options $resolver, $value) {
+            return $value ? 'true' : 'false';
+        };
+
+        $resolver->setDefined('skip_groups')
+            ->setAllowedTypes('skip_groups', 'array')
+            ->setAllowedValues('skip_groups', function (array $value) {
+                return count($value) == count(array_filter($value, 'is_int'));
+            })
+        ;
+        $resolver->setDefined('all_available')
+            ->setAllowedTypes('all_available', 'bool')
+            ->setNormalizer('all_available', $booleanNormalizer)
+        ;
+        $resolver->setDefined('search');
+        $resolver->setDefined('order_by')
+            ->setAllowedValues('order_by', ['name', 'path'])
+        ;
+        $resolver->setDefined('sort')
+            ->setAllowedValues('sort', ['asc', 'desc'])
+        ;
+        $resolver->setDefined('statistics')
+            ->setAllowedTypes('statistics', 'bool')
+            ->setNormalizer('statistics', $booleanNormalizer)
+        ;
+        $resolver->setDefined('owned')
+            ->setAllowedTypes('owned', 'bool')
+            ->setNormalizer('owned', $booleanNormalizer)
+        ;
+
+        return $resolver;
+    }
 }

lib/Gitlab/Api/IssueBoards.php

@@ -17,6 +17,47 @@ public function all($project_id = null, array $parameters = [])
         return $this->get($path, $resolver->resolve($parameters));
     }
 
+    /**
+     * @param int $project_id
+     * @param int $board_id
+     * @return mixed
+     */
+    public function show($project_id, $board_id)
+    {
+        return $this->get($this->getProjectPath($project_id, 'boards/'.$this->encodePath($board_id)));
+    }
+
+    /**
+     * @param int $project_id
+     * @param array $params
+     * @return mixed
+     */
+    public function create($project_id, array $params)
+    {
+        return $this->post($this->getProjectPath($project_id, 'boards'), $params);
+    }
+
+    /**
+     * @param int $project_id
+     * @param int $board_id
+     * @param array $params
+     * @return mixed
+     */
+    public function update($project_id, $board_id, array $params)
+    {
+        return $this->put($this->getProjectPath($project_id, 'boards/'.$this->encodePath($board_id)), $params);
+    }
+
+    /**
+     * @param int $project_id
+     * @param int $board_id
+     * @return mixed
+     */
+    public function remove($project_id, $board_id)
+    {
+        return $this->delete($this->getProjectPath($project_id, 'boards/'.$this->encodePath($board_id)));
+    }
+
     /**
      * @param int $project_id
      * @param int $board_id
@@ -27,7 +68,6 @@ public function allLists($project_id, $board_id)
         return $this->get($this->getProjectPath($project_id, 'boards/'.$this->encodePath($board_id).'/lists'));
     }
 
-
     /**
      * @param int $project_id
      * @param int $board_id
@@ -36,7 +76,7 @@ public function allLists($project_id, $board_id)
      */
     public function showList($project_id, $board_id, $list_id)
     {
-        return $this->get($this->getProjectPath($project_id, 'boards/'.$this->encodePath($board_id).'/lists'.$this->encodePath($list_id)));
+        return $this->get($this->getProjectPath($project_id, 'boards/'.$this->encodePath($board_id).'/lists/'.$this->encodePath($list_id)));
     }
 
     /**
@@ -48,12 +88,10 @@ public function showList($project_id, $board_id, $list_id)
     public function createList($project_id, $board_id, $label_id)
     {
         $params = array(
-            'id' => $project_id,
-            'board_id' => $board_id,
             'label_id' => $label_id
         );
 
-        return $this->get($this->getProjectPath($project_id, 'boards/'.$this->encodePath($board_id).'/lists'), $params);
+        return $this->post($this->getProjectPath($project_id, 'boards/'.$this->encodePath($board_id).'/lists'), $params);
     }
 
     /**
@@ -66,9 +104,6 @@ public function createList($project_id, $board_id, $label_id)
     public function updateList($project_id, $board_id, $list_id, $position)
     {
         $params = array(
-            'id' => $project_id,
-            'board_id' => $board_id,
-            'list_id' => $list_id,
             'position' => $position
         );
 

lib/Gitlab/Api/Jobs.php

@@ -81,7 +81,7 @@ public function artifacts($project_id, $job_id)
     public function artifactsByRefName($project_id, $ref_name, $job_name)
     {
         return $this->getAsResponse("projects/".$this->encodePath($project_id)."/jobs/artifacts/".$this->encodePath($ref_name)."/download", array(
-            'job' => $job_name
+            'job' => $this->encodePath($job_name)
         ))->getBody();
     }