Merging from upstream

.gitattributes

@@ -0,0 +1,11 @@
+* text=auto
+
+/doc export-ignore
+/test export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.styleci.yml export-ignore
+/.travis.yml export-ignore
+/phpunit.xml.dist export-ignore
+/README.md export-ignore
+/UPGRADE.md export-ignore

.styleci.yml

@@ -0,0 +1 @@
+preset: psr2

.travis.yml

@@ -1,15 +1,22 @@
 language: php
 
+sudo: false
+
 php:
-  - 5.3
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
+  - 7.1
+
+matrix:
+  include:
+    - php: 7.2
+      env: STATIC_ANALYSIS=yes
 
 before_script:
   - travis_retry composer self-update
   - travis_retry composer install --no-interaction --prefer-source
+  - if [ "$STATIC_ANALYSIS" != "" ]; then curl -L https://github.com/phpstan/phpstan/releases/download/0.8/phpstan.phar -o phpstan.phar; fi;
 
 script:
   - vendor/bin/phpunit --verbose --coverage-text
+  - if [ "$STATIC_ANALYSIS" != "" ]; then php phpstan.phar analyse --level=4 lib; fi;

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Matt Humphrey
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -2,47 +2,44 @@ A PHP wrapper to be used with [Gitlab's API](https://github.com/gitlabhq/gitlabh
 ==============
 
 [![Build Status](https://travis-ci.org/m4tthumphrey/php-gitlab-api.svg?branch=master)](https://travis-ci.org/m4tthumphrey/php-gitlab-api)
+[![StyleCI](https://styleci.io/repos/6816335/shield?branch=master)](https://styleci.io/repos/6816335)
+[![Total Downloads](https://poser.pugx.org/m4tthumphrey/php-gitlab-api/downloads?format=flat-square)](https://packagist.org/packages/m4tthumphrey/php-gitlab-api)
+[![Latest Stable Version](https://poser.pugx.org/m4tthumphrey/php-gitlab-api/version?format=flat-square)](https://packagist.org/packages/m4tthumphrey/php-gitlab-api)
+[![Latest Unstable Version](https://poser.pugx.org/m4tthumphrey/php-gitlab-api/v/unstable?format=flat-square)](//packagist.org/packages/m4tthumphrey/php-gitlab-api)
 
 Based on [php-github-api](https://github.com/m4tthumphrey/php-github-api) and code from [KnpLabs](https://github.com/KnpLabs/php-github-api).
 
 Installation
 ------------
-1. Install Composer
 
-    ```bash
-    $ curl -sS https://getcomposer.org/installer | php
-    $ sudo mv composer.phar /usr/local/bin/composer
-    ```
+Via [composer](https://getcomposer.org)
 
-2. Add the following to your require block in composer.json config.
-
-    > Note: be careful when using the `dev-master` tag as this may have unexpected results depending on your version of
-    Gitlab. See the Versioning section below for more information.
-
-    `php composer.phar require m4tthumphrey/php-gitlab-api:dev-master`
+```bash
+composer require m4tthumphrey/php-gitlab-api php-http/guzzle6-adapter
+```
 
-3. Include Composer's autoloader:
+Why `php-http/guzzle6-adapter`? We are decoupled from any HTTP messaging client with help by [HTTPlug](http://httplug.io).
 
-    ```php
-    require_once dirname(__DIR__).'/vendor/autoload.php';
-    ```
+You can visit [HTTPlug for library users](http://docs.php-http.org/en/latest/httplug/users.html) to get more information about installing HTTPlug related packages.
 
 Versioning
 ----------
 
-From the 6.0 stable release of Gitlab, I shall now be matching the client version with the Gitlab version. For example
-when Gitlab 6.1 is released I will release version 6.1.0 of the API client. If I need to make future updates to the client
-before the next API version is released, I'll simply use a 3rd build version - `6.1.1`, `6.1.2` etc for example.
+Depending on your Gitlab server version, you must choose the right version of this library.
+Please refer to the following table to pick the right one.
 
-It is recommended that you keep your composer file in sync with whatever version of Gitlab you are currently running:
-if you are using 6.0, you should require `6.0.*`; 6.1 should be `6.1.*`...
+|Version|Gitlab API Version|Gitlab Version|
+|-------|------------------|--------------|
+|9.x    | V4               | >= 9.0       |
+|8.x    | V3               | < 9.5        |
 
 General API Usage
 -----------------
 
 ```php
-$client = new \Gitlab\Client('http://git.yourdomain.com/api/v3/');               // change here
-$client->authenticate('your_gitlab_token_here', \Gitlab\Client::AUTH_URL_TOKEN); // change here
+$client = \Gitlab\Client::create('http://git.yourdomain.com')
+    ->authenticate('your_gitlab_token_here', \Gitlab\Client::AUTH_URL_TOKEN)
+;
 
 $project = $client->api('projects')->create('My Project', array(
   'description' => 'This is a project',
@@ -57,8 +54,9 @@ Model Usage
 You can also use the library in an object oriented manner:
 
 ```php
-$client = new \Gitlab\Client('http://git.yourdomain.com/api/v3/');               // change here
-$client->authenticate('your_gitlab_token_here', \Gitlab\Client::AUTH_URL_TOKEN); // change here
+$client = \Gitlab\Client::create('http://git.yourdomain.com')
+    ->authenticate('your_gitlab_token_here', \Gitlab\Client::AUTH_URL_TOKEN)
+;
 
 # Creating a new project
 $project = \Gitlab\Model\Project::create($client, 'My Project', array(
@@ -85,7 +83,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/gitlab
+- **Laravel** - https://github.com/vinkla/laravel-gitlab
 
 If you have integrated GitLab into a popular PHP framework, let us know!
 

UPGRADE.md

@@ -0,0 +1,90 @@
+# UPGRADE FROM 8.0 to 9.0
+
+Since 9.0, lib no longer use buzz 0.7+, instead it has an HTTPlug abstraction layer.
+
+## `Gitlab\Client` changes
+
+* The constructor no longer allow to specify base url. Use `setUrl` or `Client::create` instead.
+* The default url is set to `https://gitlab.com`.
+* The `$options` constructor argument have been removed, the `getOption` and `setOption` methods have been removed.
+See [documentation](doc/customize.md) to know how to customize the client timeout and how to use a custom user agent.
+* The `setBaseUrl` and `getBaseUrl` methods have been removed. Use `setUrl` instead.
+* The `clearHeaders` and `setHeaders` methods have been removed. See [documentation](doc/customize.md) to know how use custom headers.
+* The `setHttpClient` method have been removed. Use a `Gitlab\HttpClient\Builder` instead. 
+* The `getHttpClient` method return type is changed to `Http\Client\Common\HttpMethodsClient`.
+
+## `Gitlab\Api\AbstractApi` changes
+
+* The `PER_PAGE` class constant have been removed.
+
+## `Gitlab\Api\DeployKeys` changes
+
+* The `all` method now take a single argument which is an associative array of query string parameters.
+* The `ORDER_BY` and `SORT` class constants have been removed.
+
+## `Gitlab\Api\Groups` changes
+
+* The `visibility_level` parameter have been removed from `create` method. Use `visibility` instead.
+* The `all` method now take a single argument which is an associative array of query string parameters.
+* The `search` method have been removed. Use `all` method instead.
+* The `members` method second and subsequent arguments have been replaced by a single associative array of query string parameters.
+* The `projects` method second and subsequent arguments have been replaced by a single associative array of query string parameters.
+
+## `Gitlab\Api\Issues` changes
+
+* The second argument of `update`, `remove`, `showComments`, `showComment`, `addComment`, `updateComment`, `removeComment`,
+ `setTimeEstimate`, `resetTimeEstimate`, `addSpentTime` and `resetSpentTime` methods is now a scoped issue id (iid).
+* The `all` method second and subsequent arguments have been replaced by a single associative array of query string parameters.
+
+## `Gitlab\Api\IssueBoards` changes
+
+* The `all` method second and subsequent arguments have been replaced by a single associative array of query string parameters.
+
+## `Gitlab\Api\MergeRequests` changes
+
+* The `getList`, `getByIid`, `merged`, `opened` and `closed` methods have been removed. Use `all` method instead.
+* The `ORDER_BY` and `SORT` class constants have been removed.
+* The `all` method now take a single argument which is an associative array of query string parameters.
+* The `getNotes` method now take only two arguments, the project id and the merge request iid.
+
+## `Gitlab\Api\Milestones` changes
+
+* The `all` method second and subsequent arguments have been replaced by a single associative array of query string parameters.
+
+## `Gitlab\Api\Projects` changes
+
+* The `keys`, `key`, `addKey`, `removeKey`, `disableKey` and `enableKey` methods have been removed.
+Use the `deployKeys`, `deployKey`, `addDeployKey`, `deleteDeployKey`, `removeDeployKey` and `enableDeployKey` instead.
+* The `ORDER_BY` and `SORT` class constants have been removed.
+* The `accessible`, `owned` and `search` methods have been removed. Use `all` method instead.
+* The `all` method now take a single argument which is an associative array of query string parameters.
+* The `trace` method have been removed. Use `Gitlab\Api\Jobs::trace` instead.
+* The `builds` method have been removed. Use `Gitlab\Api\Jobs::all` instead.
+* The `build` method have been removed. Use `Gitlab\Api\Jobs::show` instead.
+* The `events` method second and subsequent arguments have been replaced by a single associative array of query string parameters.
+* The `deployments` method second and subsequent arguments have been replaced by a single associative array of query string parameters.
+
+## `Gitlab\Api\ProjectNamespaces` changes
+
+* The `search` method have been removed. Use `all` method instead.
+* The `all` method now take a single argument which is an associative array of query string parameters.
+
+## `Gitlab\Api\Repositories` changes
+
+* The `commitBuilds` method have been removed. Use `Gitlab\Api\Projects::pipelines` instead.
+* The `commits` method second and subsequent arguments have been replaced by a single associative array of query string parameters.
+* The `commitComments` method third and subsequent arguments have been replaced by a single associative array of query string parameters.
+
+## `Gitlab\Model\Project` changes
+
+* The `keys`, `key`, `addKey`, `removeKey`, `disableKey` and `enableKey` methods have been removed.
+Use the `deployKeys`, `deployKey`, `addDeployKey`, `deleteDeployKey`, `removeDeployKey` and `enableDeployKey` instead.
+
+## `Gitlab\Model\Snippet` changes
+
+* The `expires_at` property have been removed.`
+
+## `Gitlab\Model\Users` changes
+
+* The `all` method now take a single argument which is an associative array of query string parameters.
+* The `lookup` and `search` methods have been removed. Use `all` method instead.

composer.json

@@ -1,35 +1,49 @@
-{
-	"name": "m4tthumphrey/php-gitlab-api",
-	"type": "library",
-	"description": "GitLab API client",
-	"homepage": "https://github.com/m4tthumphrey/php-gitlab-api",
-	"keywords": ["gitlab", "api"],
-	"license": "MIT",
-	"authors": [
-		{
-			"name": "Matt Humphrey",
-			"homepage": "http://m4tt.io"
-		},
-		{
-			"name": "KnpLabs Team",
-			"homepage": "http://knplabs.com"
-		},
-		{
-			"name": "Thibault Duplessis",
-			"email": "thibault.duplessis@gmail.com",
-			"homepage": "http://ornicar.github.com"
-		}
-	],
-	"require": {
-		"php":                ">=5.3.2",
-		"ext-curl":           "*",
-		"ext-xml":            "*",
-		"kriswallsmith/buzz": ">=0.7"
-	},
-	"require-dev": {
-		"phpunit/phpunit": "~4.5"
-	},
-	"autoload": {
-		"psr-0": { "Gitlab\\": "lib/" }
-	}
-}
+{
+	"name": "m4tthumphrey/php-gitlab-api",
+	"type": "library",
+	"description": "GitLab API client",
+	"homepage": "https://github.com/m4tthumphrey/php-gitlab-api",
+	"keywords": ["gitlab", "api"],
+	"license": "MIT",
+	"authors": [
+		{
+			"name": "Matt Humphrey",
+			"homepage": "http://m4tt.io"
+		},
+		{
+			"name": "KnpLabs Team",
+			"homepage": "http://knplabs.com"
+		},
+		{
+			"name": "Thibault Duplessis",
+			"email": "thibault.duplessis@gmail.com",
+			"homepage": "http://ornicar.github.com"
+		}
+	],
+	"require": {
+		"php": "^5.6 || ^7.0",
+		"php-http/client-common": "^1.5",
+		"php-http/client-implementation": "^1.0",
+		"php-http/discovery": "^1.2",
+		"php-http/httplug": "^1.1",
+		"php-http/multipart-stream-builder": "^1.0",
+		"symfony/options-resolver": "^2.6 || ^3.0"
+	},
+	"require-dev": {
+		"guzzlehttp/psr7": "^1.2",
+		"php-http/guzzle6-adapter": "^1.0",
+		"php-http/mock-client": "^1.0",
+		"phpunit/phpunit": "~4.5"
+	},
+	"autoload": {
+		"psr-4": { "Gitlab\\": "lib/Gitlab/" }
+	},
+	"autoload-dev": {
+		"psr-4": { "Gitlab\\Tests\\": "test/Gitlab/Tests/" }
+	},
+	"extra": {
+		"branch-alias": {
+			"dev-master": "9.0.x-dev"
+		}
+	}
+}

doc/customize.md

@@ -0,0 +1,28 @@
+## Customize `php-gitlab-api`
+
+### How to set custom headers (including `User-Agent`)?
+
+By providing a `Gitlab\HttpClient\Builder` to the `Gitlab\Client` constructor, you can customize the HTTP client.
+
+```php
+$plugin = new Http\Client\Common\Plugin\HeaderSetPlugin([
+    'User-Agent' => 'Foobar',
+]);
+
+$builder = new Gitlab\HttpClient\Builder();
+$builder->addPlugin($plugin);
+
+$client = new Gitlab\Client($builder);
+```
+Read more about [HTTPlug plugins here](http://docs.php-http.org/en/latest/plugins/introduction.html#how-it-works).
+
+### How to customize the HTTP client timeout?
+As timeout configuration is not compatible with HTTP client abstraction, you have to create the `Gitlab\Client` with
+an explicit HTTP client implementation.
+
+```php
+$httpClient = Http\Adapter\Guzzle6::createWithConfig([
+    'timeout' => 1.0
+]);
+$client = Gitlab\Client::createWithHttpClient($httpClient);
+```