Merge pull request GitLabPHP#1 from m4tthumphrey/master

update upstream

Author: woodylan

.travis.yml

@@ -6,15 +6,17 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
 
 matrix:
+  # test latest PHP stable version with lowest dependencies and phpstan static analysis
   include:
-    - php: 7.2
-      env: STATIC_ANALYSIS=yes
+    - php: 7.1
+      env: COMPOSER_FLAGS="--prefer-lowest" STATIC_ANALYSIS=yes
 
 before_script:
   - travis_retry composer self-update
-  - travis_retry composer install --no-interaction --prefer-source
+  - 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:

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Matt Humphrey
+Copyright (c) 2018 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

README.md

@@ -57,7 +57,7 @@ to fetch all your closed issue with pagination ( on the gitlab api )
 $client = \Gitlab\Client::create('http://git.yourdomain.com')
     ->authenticate('your_gitlab_token_here', \Gitlab\Client::AUTH_URL_TOKEN)
 ;
-$pager = new ResultPager($client);
+$pager = new \Gitlab\ResultPager($client);
 $issues = $pager->fetchall($client->api('issues'),'all',[null, ['state' => 'closed']]);
 
 ```
@@ -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,18 +23,18 @@
 	"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",
 		"php-http/multipart-stream-builder": "^1.0",
-		"symfony/options-resolver": "^2.6 || ^3.0"
+		"symfony/options-resolver": "^2.6 || ^3.0 || ^4.0"
 	},
 	"require-dev": {
 		"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"
 		}
 	}
 }

lib/Gitlab/Api/Deployments.php

@@ -0,0 +1,25 @@
+<?php namespace Gitlab\Api;
+
+class Deployments extends AbstractApi
+{
+    /**
+     * @param int $project_id
+     * @param array $parameters
+     * @return mixed
+     */
+    public function all($project_id, array $parameters = [])
+    {
+        $resolver = $this->createOptionsResolver();
+        return $this->get($this->getProjectPath($project_id, 'deployments'), $resolver->resolve($parameters));
+    }
+
+    /**
+     * @param int $project_id
+     * @param string $deployment_id
+     * @return mixed
+     */
+    public function show($project_id, $deployment_id)
+    {
+        return $this->get($this->getProjectPath($project_id, 'deployments/' . $deployment_id));
+    }
+}

lib/Gitlab/Api/Environments.php

@@ -0,0 +1,48 @@
+<?php namespace Gitlab\Api;
+
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class Environments extends AbstractApi
+{
+    /**
+     * @param int $project_id
+     * @param array $parameters
+     * @return mixed
+     */
+    public function all($project_id, array $parameters = [])
+    {
+        $resolver = $this->createOptionsResolver();
+        return $this->get($this->getProjectPath($project_id, 'environments'), $resolver->resolve($parameters));
+    }
+
+    /**
+     * @param int $project_id
+     * @param array $parameters (
+     *
+     *     @var string $name         The name of the environment
+     *     @var string $external_url Place to link to for this environment
+     * )
+     * @return mixed
+     */
+    public function create($project_id, array $parameters = array())
+    {
+        $resolver = new OptionsResolver();
+        $resolver->setDefined('name')
+            ->setRequired('name')
+            ->setAllowedTypes('name', 'string');
+        $resolver->setDefined('external_url')
+            ->setAllowedTypes('external_url', 'string');
+
+        return $this->post($this->getProjectPath($project_id, 'environment'), $resolver->resolve($parameters));
+    }
+
+    /**
+     * @param int $project_id
+     * @param string $environment_id
+     * @return mixed
+     */
+    public function remove($project_id, $environment_id)
+    {
+        return $this->delete($this->getProjectPath($project_id, 'environments/' . $environment_id));
+    }
+}

lib/Gitlab/Api/Groups.php

@@ -1,5 +1,7 @@
 <?php namespace Gitlab\Api;
 
+use Symfony\Component\OptionsResolver\Options;
+
 class Groups extends AbstractApi
 {
     /**
@@ -18,7 +20,7 @@ class Groups extends AbstractApi
     public function all(array $parameters = [])
     {
         $resolver = $this->createOptionsResolver();
-        $booleanNormalizer = function ($value) {
+        $booleanNormalizer = function (Options $resolver, $value) {
             return $value ? 'true' : 'false';
         };
 
@@ -180,7 +182,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';
         };
 

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();
     }
 

lib/Gitlab/Api/MergeRequests.php

@@ -1,5 +1,6 @@
 <?php namespace Gitlab\Api;
 
+use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
 use Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException;
 
@@ -36,7 +37,7 @@ class MergeRequests extends AbstractApi
     public function all($project_id, array $parameters = [])
     {
         $resolver = $this->createOptionsResolver();
-        $datetimeNormalizer = function (\DateTimeInterface $value) {
+        $datetimeNormalizer = function (Options $resolver, \DateTimeInterface $value) {
             return $value->format('c');
         };
         $resolver->setDefined('iids')
@@ -67,7 +68,8 @@ public function all($project_id, array $parameters = [])
             ->setAllowedTypes('created_before', \DateTimeInterface::class)
             ->setNormalizer('created_before', $datetimeNormalizer)
         ;
-
+        $resolver->setDefined('search');
+        
         return $this->get($this->getProjectPath($project_id, 'merge_requests'), $resolver->resolve($parameters));
     }
 

lib/Gitlab/Api/Projects.php

@@ -1,5 +1,6 @@
 <?php namespace Gitlab\Api;
 
+use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
 use Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -33,7 +34,7 @@ class Projects extends AbstractApi
     public function all(array $parameters = [])
     {
         $resolver = $this->createOptionsResolver();
-        $booleanNormalizer = function ($value) {
+        $booleanNormalizer = function (Options $resolver, $value) {
             return $value ? 'true' : 'false';
         };
         $resolver->setDefined('archived')
@@ -84,11 +85,28 @@ public function all(array $parameters = [])
 
     /**
      * @param int $project_id
+     * @param array $parameters {
+     *
+     *     @var bool   $statistics                    Include project statistics.
+     *     @var bool   $with_custom_attributes        Include project custom attributes.
+     * }
      * @return mixed
      */
-    public function show($project_id)
+    public function show($project_id, array $parameters = [])
     {
-        return $this->get('projects/'.$this->encodePath($project_id));
+        $resolver = $this->createOptionsResolver();
+        $booleanNormalizer = function (Options $resolver, $value) {
+            return $value ? true : false;
+        };
+        $resolver->setDefined('statistics')
+            ->setAllowedTypes('statistics', 'bool')
+            ->setNormalizer('statistics', $booleanNormalizer)
+        ;
+        $resolver->setDefined('with_custom_attributes')
+            ->setAllowedTypes('with_custom_attributes', 'bool')
+            ->setNormalizer('with_custom_attributes', $booleanNormalizer)
+        ;
+        return $this->get('projects/'.$this->encodePath($project_id), $resolver->resolve($parameters));
     }
 
     /**
@@ -171,7 +189,7 @@ public function unarchive($project_id)
     public function pipelines($project_id, array $parameters = [])
     {
         $resolver = $this->createOptionsResolver();
-        $booleanNormalizer = function ($value) {
+        $booleanNormalizer = function (Options $resolver, $value) {
             return $value ? 'true' : 'false';
         };
 
@@ -241,14 +259,33 @@ public function cancelPipeline($project_id, $pipeline_id)
 
     /**
      * @param int $project_id
-     * @param string $username_query
+     * @param array $parameters (
+     *
+     *     @var string $query           The query you want to search members for.
+     * )
+     *
+     * @throws MissingOptionsException  If a required option is not provided
+     *
      * @return mixed
      */
-    public function members($project_id, $username_query = null)
+    public function members($project_id, $parameters = [])
     {
-        return $this->get($this->getProjectPath($project_id, 'members'), array(
-            'query' => $username_query
-        ));
+        if (!is_array($parameters)) {
+            @trigger_error("Deprecated: String parameter of the members() function is deprecated.", E_USER_NOTICE);
+            $username_query = $parameters;
+            $parameters = array();
+            if (!empty($username_query)) {
+                $parameters['query'] = $username_query;
+            }
+        }
+
+        $resolver = $this->createOptionsResolver();
+
+        $resolver->setDefined('query')
+            ->setAllowedTypes('query', 'string')
+        ;
+
+        return $this->get($this->getProjectPath($project_id, 'members'), $resolver->resolve($parameters));
     }
 
     /**
@@ -430,7 +467,7 @@ public function enableDeployKey($project_id, $key_id)
     public function events($project_id, array $parameters = [])
     {
         $resolver = $this->createOptionsResolver();
-        $datetimeNormalizer = function (\DateTimeInterface $value) {
+        $datetimeNormalizer = function (Options $resolver, \DateTimeInterface $value) {
             return $value->format('Y-m-d');
         };
 
@@ -495,6 +532,17 @@ public function removeLabel($project_id, $name)
         ));
     }
 
+    /**
+     * Get languages used in a project with percentage value.
+     *
+     * @param int $project_id
+     * @return mixed
+     */
+    public function languages($project_id)
+    {
+        return $this->get($this->getProjectPath($project_id, 'languages'));
+    }
+
     /**
      * @param int $project_id
      * @param array $params (
@@ -555,11 +603,15 @@ public function removeService($project_id, $service_name)
 
     /**
      * @param int $project_id
+     * @param array $parameters
+     *
      * @return mixed
      */
-    public function variables($project_id)
+    public function variables($project_id, array $parameters = [])
     {
-        return $this->get($this->getProjectPath($project_id, 'variables'));
+        $resolver = $this->createOptionsResolver();
+
+        return $this->get($this->getProjectPath($project_id, 'variables'), $resolver->resolve($parameters));
     }
 
     /**