Switch to PSR18 client impl

Author: GrahamCampbell

.styleci.yml

@@ -1 +1,9 @@
-preset: psr2
+preset: psr12
+
+enabled:
+  - phpdoc_indent
+  - phpdoc_scalar
+
+disabled:
+  - blank_line_after_opening_tag
+  - concat_with_spaces

.travis.yml

@@ -1,24 +1,22 @@
 language: php
 
+dist: bionic
+
 php:
-  - 5.6
-  - 7.0
   - 7.1
   - 7.2
   - 7.3
   - 7.4
 
 matrix:
-  # test latest PHP stable version with lowest dependencies and phpstan static analysis
   include:
-    - php: 7.3
-      env: STATIC_ANALYSIS=yes
+    - php: 7.4
+      name: phpstan
+      script:
+        - vendor/bin/phpstan analyse --no-progress
 
-before_script:
-  - travis_retry composer self-update
+install:
   - travis_retry composer update --no-interaction ${COMPOSER_FLAGS}
-  - 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;

README.md

@@ -12,15 +12,33 @@ Based on [php-github-api](https://github.com/m4tthumphrey/php-github-api) and co
 Installation
 ------------
 
-Via [composer](https://getcomposer.org)
+Via [Composer](https://getcomposer.org).
+
+### PHP 7.2+:
+
+```bash
+composer require m4tthumphrey/php-gitlab-api guzzlehttp/guzzle:^7.0.1
+```
+
+### PHP 7.1+:
+
+```bash
+composer require m4tthumphrey/php-gitlab-api php-http/guzzle6-adapter:^2.0.1
+```
+
+### Laravel 5.5+:
 
 ```bash
-composer require m4tthumphrey/php-gitlab-api php-http/guzzle6-adapter:^1.0
+composer require graham-campbell/gitlab guzzlehttp/guzzle:^7.0.1
 ```
 
-Why `php-http/guzzle6-adapter`? We are decoupled from any HTTP messaging client with help by [HTTPlug](http://httplug.io).
+### Symfony 3.4+:
 
-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.
+```bash
+composer require zeichen32/gitlabapibundle guzzlehttp/guzzle:^7.0.1
+```
+
+We are decoupled from any HTTP messaging client with help by [HTTPlug](http://httplug.io). You can visit [HTTPlug for library users](https://docs.php-http.org/en/latest/httplug/users.html) to get more information about installing HTTPlug related packages. [graham-campbell/gitlab](https://github.com/GrahamCampbell/Laravel-GitLab) is by [Graham Campbell](https://github.com/GrahamCampbell) and [zeichen32/gitlabapibundle](https://github.com/Zeichen32/GitLabApiBundle) is by [Jens Averkamp](https://github.com/Zeichen32).
 
 Versioning
 ----------
@@ -98,18 +116,9 @@ $issue = $project->createIssue('This does not work.', array(
 $issue->close();
 ```
 
-You get the idea! Take a look around ([API methods](https://github.com/m4tthumphrey/php-gitlab-api/tree/master/lib/Gitlab/Api),
-[models](https://github.com/m4tthumphrey/php-gitlab-api/tree/master/lib/Gitlab/Model)) and please feel free to report any bugs.
-
-Framework Integrations
-----------------------
-- **Symfony** - https://github.com/Zeichen32/GitLabApiBundle
-- **Laravel** - https://github.com/GrahamCampbell/Laravel-GitLab
-
-If you have integrated GitLab into a popular PHP framework, let us know!
+You get the idea! Take a look around ([API methods](https://github.com/m4tthumphrey/php-gitlab-api/tree/master/lib/Gitlab/Api), [models](https://github.com/m4tthumphrey/php-gitlab-api/tree/master/lib/Gitlab/Model)) and please feel free to report any bugs. If you have integrated GitLab into a popular PHP framework, let us know!
 
 Contributing
 ------------
 
-There are many parts of Gitlab that I have not added to this as it was originally created for personal use, hence the
-lack of tests. Feel free to fork and add new functionality and tests, I'll gladly accept decent pull requests.
+There are many parts of Gitlab that I have not added to this as it was originally created for personal use, hence the lack of tests. Feel free to fork and add new functionality and tests, I'll gladly accept decent pull requests.

composer.json

@@ -1,50 +1,51 @@
 {
-	"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",
-		"ext-xml": "*",
-		"php-http/client-common": "^1.6 || ^2.0",
-		"php-http/client-implementation": "^1.0",
-		"php-http/discovery": "^1.2",
-		"php-http/httplug": "^1.1 || ^2.0",
-		"php-http/multipart-stream-builder": "^1.0",
-		"symfony/options-resolver": "^2.6 || ^3.0 || ^4.0 || ^5.0"
-	},
-	"require-dev": {
-		"guzzlehttp/psr7": "^1.2",
-		"php-http/guzzle6-adapter": "^1.0 || ^2.0",
-		"php-http/mock-client": "^1.2",
-		"phpunit/phpunit": "^5.7.27 || ^7.5.15"
-	},
-	"autoload": {
-		"psr-4": { "Gitlab\\": "lib/Gitlab/" }
-	},
-	"autoload-dev": {
-		"psr-4": { "Gitlab\\Tests\\": "test/Gitlab/Tests/" }
-	},
-	"extra": {
-		"branch-alias": {
-			"dev-master": "9.17-dev"
-		}
-	}
+    "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": "^7.1",
+        "ext-xml": "*",
+        "php-http/client-common": "^2.1",
+        "php-http/cache-plugin": "^1.7",
+        "php-http/discovery": "^1.7",
+        "php-http/httplug": "^2.1",
+        "php-http/multipart-stream-builder": "^1.1",
+        "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0"
+    },
+    "require-dev": {
+        "guzzlehttp/psr7": "^1.2",
+        "php-http/guzzle6-adapter": "^2.0",
+        "php-http/mock-client": "^1.2",
+        "phpunit/phpunit": "^7.5.15",
+        "phpstan/phpstan": "^0.12.23"
+    },
+    "autoload": {
+        "psr-4": { "Gitlab\\": "lib/Gitlab/" }
+    },
+    "autoload-dev": {
+        "psr-4": { "Gitlab\\Tests\\": "test/Gitlab/Tests/" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "9.17-dev"
+        }
+    }
 }

lib/Gitlab/Api/AbstractApi.php

@@ -248,7 +248,7 @@ private function preparePath($path, array $parameters = [])
     }
 
     /**
-     * @param $file
+     * @param string $file
      *
      * @return string
      */

lib/Gitlab/Api/Groups.php

@@ -90,8 +90,8 @@ public function transfer($group_id, $project_id)
     }
 
     /**
-     * @param integer $id
-     * @param integer|null $user_id
+     * @param int $id
+     * @param int|null $user_id
      * @param array $parameters
      * @return mixed
      */
@@ -158,7 +158,7 @@ public function removeMember($group_id, $user_id)
     }
 
     /**
-     * @param $id
+     * @param int $id
      * @param array $parameters (
      *
      *     @var bool   $archived                    Limit by archived status.

lib/Gitlab/Api/Issues.php

@@ -301,10 +301,10 @@ public function awardEmoji($project_id, $issue_iid)
     }
 
     /**
-    * @param int $project_id
-    * @param int $issue_iid
-    * @return mixed
-    */
+     * @param int $project_id
+     * @param int $issue_iid
+     * @return mixed
+     */
     public function closedByMergeRequests($project_id, $issue_iid)
     {
         return $this->get($this->getProjectPath($project_id, 'issues/'.$this->encodePath($issue_iid)).'/closed_by');
@@ -319,7 +319,7 @@ public function showParticipants($project_id, $issue_iid)
     {
         return $this->get($this->getProjectPath($project_id, 'issues/' .$this->encodePath($issue_iid)).'/participants');
     }
-  
+
     /**
      * {@inheritDoc}
      */

lib/Gitlab/Api/MergeRequests.php

@@ -158,7 +158,7 @@ public function update($project_id, $mr_id, array $params)
     /**
      * @param int $project_id
      * @param int $mr_id
-     * @param string $message
+     * @param string|array $message
      * @return mixed
      */
     public function merge($project_id, $mr_id, $message = null)

lib/Gitlab/Api/ProjectNamespaces.php

@@ -19,7 +19,7 @@ public function all(array $parameters = [])
     }
 
     /**
-     * @param integer|string $namespace_id
+     * @param int|string $namespace_id
      * @return mixed
      */
     public function show($namespace_id)

lib/Gitlab/Api/Projects.php

@@ -287,10 +287,10 @@ public function cancelPipeline($project_id, $pipeline_id)
     {
         return $this->post($this->getProjectPath($project_id, 'pipelines/'.$this->encodePath($pipeline_id)).'/cancel');
     }
-    
+
     /**
-     * @param $project_id
-     * @param $pipeline_id
+     * @param int $project_id
+     * @param int $pipeline_id
      * @return mixed
      */
     public function deletePipeline($project_id, $pipeline_id)
@@ -299,8 +299,8 @@ public function deletePipeline($project_id, $pipeline_id)
     }
 
     /**
-     * @param integer $project_id
-     * @param integer|null $user_id
+     * @param int $project_id
+     * @param int|null $user_id
      * @param array $parameters
      * @return mixed
      */
@@ -315,11 +315,10 @@ public function allMembers($project_id, $user_id = null, $parameters = [])
     /**
      * @param int $project_id
      * @param array $parameters (
-     *
      *     @var string $query           The query you want to search members for.
      * )
      *
-     * @throws MissingOptionsException  If a required option is not provided
+     * @throws \Symfony\Component\OptionsResolver\Exception\MissingOptionsException  If a required option is not provided
      *
      * @return mixed
      */
@@ -664,32 +663,31 @@ public function languages($project_id)
 
     /**
      * @param int $project_id
-     * @param array $parameters
+     * @param array $params
      * @return mixed
      */
-    public function forks($project_id, array $parameters = [])
+    public function forks($project_id, array $params = [])
     {
         $resolver = $this->createOptionsResolver();
 
-        return $this->get($this->getProjectPath($project_id, 'forks'), $resolver->resolve($parameters));
+        return $this->get($this->getProjectPath($project_id, 'forks'), $resolver->resolve($params));
     }
 
     /**
      * @param int $project_id
      * @param array $params (
-     *
      *     @var string $namespace      The ID or path of the namespace that the project will be forked to
      *     @var string $path           The path of the forked project (optional)
      *     @var string $name           The name of the forked project (optional)
      * )
      * @return mixed
      */
-    public function fork($project_id, array $parameters = [])
+    public function fork($project_id, array $params = [])
     {
         $resolver = new OptionsResolver();
         $resolver->setDefined(['namespace', 'path', 'name']);
 
-        $resolved = $resolver->resolve($parameters);
+        $resolved = $resolver->resolve($params);
 
         return $this->post($this->getProjectPath($project_id, 'fork'), $resolved);
     }
@@ -848,7 +846,7 @@ public function deployment($project_id, $deployment_id)
     {
         return $this->get($this->getProjectPath($project_id, 'deployments/'.$this->encodePath($deployment_id)));
     }
-    
+
     /**
      * @param mixed $project_id
      * @param array $parameters
@@ -876,7 +874,7 @@ public function addShare($project_id, array $parameters = [])
 
         return $this->post($this->getProjectPath($project_id, 'share'), $resolver->resolve($parameters));
     }
-    
+
     /**
      * @param mixed $project_id
      * @param int $group_id
@@ -931,7 +929,7 @@ public function removeBadge($project_id, $badge_id)
      * @param string $badge_id
      * @param array $params
      * @return mixed
-    */
+     */
     public function updateBadge($project_id, $badge_id, array $params = array())
     {
         return $this->put($this->getProjectPath($project_id, 'badges/' . $this->encodePath($badge_id)), $params);

lib/Gitlab/Api/Repositories.php

@@ -188,7 +188,7 @@ public function commits($project_id, array $parameters = [])
 
     /**
      * @param int $project_id
-     * @param $sha
+     * @param string $sha
      * @return mixed
      */
     public function commit($project_id, $sha)
@@ -198,7 +198,7 @@ public function commit($project_id, $sha)
 
     /**
      * @param int $project_id
-     * @param $sha
+     * @param string $sha
      * @param array $parameters
      * @return mixed
      */