Merge branch '10.0' into 10.1

Author: GrahamCampbell

.github/CONTRIBUTING.md

@@ -21,7 +21,7 @@ First, install the dependencies:
 $ make install
 ```
 
-Then run the test suite and static analyzer:
+Then run the test suite and static analyzers:
 
 ```bash
 $ make test

composer.json

@@ -27,7 +27,7 @@
         "ext-xml": "*",
         "php-http/cache-plugin": "^1.7",
         "php-http/client-common": "^2.3",
-        "php-http/discovery": "^1.9",
+        "php-http/discovery": "^1.12",
         "php-http/httplug": "^2.1",
         "php-http/multipart-stream-builder": "^1.1",
         "psr/cache": "^1.0",

phpstan-baseline.neon

@@ -1,7 +1,7 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Parameter \\#1 \\$error_handler of function set_error_handler expects \\(callable\\(int, string, string, int, array\\)\\: bool\\)\\|null, Closure\\(\\)\\: void given\\.$#"
+			message: "#^Parameter \\#1 \\$callback of function set_error_handler expects \\(callable\\(int, string, string, int, array\\)\\: bool\\)\\|null, Closure\\(\\)\\: void given\\.$#"
 			count: 1
 			path: src/Api/AbstractApi.php
 

psalm-baseline.xml

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

src/Api/Groups.php

@@ -31,11 +31,11 @@ public function all(array $parameters = [])
     }
 
     /**
-     * @param int $id
+     * @param int|string $id
      *
      * @return mixed
      */
-    public function show(int $id)
+    public function show($id)
     {
         return $this->get('groups/'.self::encodePath($id));
     }
@@ -71,44 +71,44 @@ public function create(string $name, string $path, string $description = null, s
     }
 
     /**
-     * @param int   $id
-     * @param array $params
+     * @param int|string $id
+     * @param array      $params
      *
      * @return mixed
      */
-    public function update(int $id, array $params)
+    public function update($id, array $params)
     {
         return $this->put('groups/'.self::encodePath($id), $params);
     }
 
     /**
-     * @param int $group_id
+     * @param int|string $group_id
      *
      * @return mixed
      */
-    public function remove(int $group_id)
+    public function remove($group_id)
     {
         return $this->delete('groups/'.self::encodePath($group_id));
     }
 
     /**
-     * @param int        $group_id
+     * @param int|string $group_id
      * @param int|string $project_id
      *
      * @return mixed
      */
-    public function transfer(int $group_id, $project_id)
+    public function transfer($group_id, $project_id)
     {
         return $this->post('groups/'.self::encodePath($group_id).'/projects/'.self::encodePath($project_id));
     }
 
     /**
-     * @param int   $group_id
-     * @param array $parameters
+     * @param int|string $group_id
+     * @param array      $parameters
      *
      * @return mixed
      */
-    public function allMembers(int $group_id, array $parameters = [])
+    public function allMembers($group_id, array $parameters = [])
     {
         $resolver = $this->createOptionsResolver();
         $resolver->setDefined('query');
@@ -117,15 +117,15 @@ public function allMembers(int $group_id, array $parameters = [])
     }
 
     /**
-     * @param int   $group_id
-     * @param array $parameters {
+     * @param int|string $group_id
+     * @param array      $parameters {
      *
      *     @var string $query A query string to search for members.
      * }
      *
      * @return mixed
      */
-    public function members(int $group_id, array $parameters = [])
+    public function members($group_id, array $parameters = [])
     {
         $resolver = $this->createOptionsResolver();
         $resolver->setDefined('query');
@@ -134,24 +134,24 @@ public function members(int $group_id, array $parameters = [])
     }
 
     /**
-     * @param int $group_id
-     * @param int $user_id
+     * @param int|string $group_id
+     * @param int        $user_id
      *
      * @return mixed
      */
-    public function member(int $group_id, int $user_id)
+    public function member($group_id, int $user_id)
     {
         return $this->get('groups/'.self::encodePath($group_id).'/members/'.self::encodePath($user_id));
     }
 
     /**
-     * @param int $group_id
-     * @param int $user_id
-     * @param int $access_level
+     * @param int|string $group_id
+     * @param int        $user_id
+     * @param int        $access_level
      *
      * @return mixed
      */
-    public function addMember(int $group_id, int $user_id, int $access_level)
+    public function addMember($group_id, int $user_id, int $access_level)
     {
         return $this->post('groups/'.self::encodePath($group_id).'/members', [
             'user_id' => $user_id,
@@ -160,33 +160,33 @@ public function addMember(int $group_id, int $user_id, int $access_level)
     }
 
     /**
-     * @param int $group_id
-     * @param int $user_id
-     * @param int $access_level
+     * @param int|string $group_id
+     * @param int        $user_id
+     * @param int        $access_level
      *
      * @return mixed
      */
-    public function saveMember(int $group_id, int $user_id, int $access_level)
+    public function saveMember($group_id, int $user_id, int $access_level)
     {
         return $this->put('groups/'.self::encodePath($group_id).'/members/'.self::encodePath($user_id), [
             'access_level' => $access_level,
         ]);
     }
 
     /**
-     * @param int $group_id
-     * @param int $user_id
+     * @param int|string $group_id
+     * @param int        $user_id
      *
      * @return mixed
      */
-    public function removeMember(int $group_id, int $user_id)
+    public function removeMember($group_id, int $user_id)
     {
         return $this->delete('groups/'.self::encodePath($group_id).'/members/'.self::encodePath($user_id));
     }
 
     /**
-     * @param int   $id
-     * @param array $parameters {
+     * @param int|string $id
+     * @param array      $parameters {
      *
      *     @var bool   $archived                    limit by archived status
      *     @var string $visibility                  limit by visibility public, internal, or private
@@ -206,7 +206,7 @@ public function removeMember(int $group_id, int $user_id)
      *
      * @return mixed
      */
-    public function projects(int $id, array $parameters = [])
+    public function projects($id, array $parameters = [])
     {
         $resolver = $this->createOptionsResolver();
         $booleanNormalizer = function (Options $resolver, $value) {
@@ -264,8 +264,8 @@ public function projects(int $id, array $parameters = [])
     }
 
     /**
-     * @param int   $group_id
-     * @param array $parameters {
+     * @param int|string $group_id
+     * @param array      $parameters {
      *
      *     @var int[]  $skip_groups   skip the group IDs passes
      *     @var bool   $all_available show all the groups you have access to
@@ -278,94 +278,94 @@ public function projects(int $id, array $parameters = [])
      *
      * @return mixed
      */
-    public function subgroups(int $group_id, array $parameters = [])
+    public function subgroups($group_id, array $parameters = [])
     {
         $resolver = $this->getGroupSearchResolver();
 
         return $this->get('groups/'.self::encodePath($group_id).'/subgroups', $resolver->resolve($parameters));
     }
 
     /**
-     * @param int   $group_id
-     * @param array $parameters
+     * @param int|string $group_id
+     * @param array      $parameters
      *
      * @return mixed
      */
-    public function labels(int $group_id, array $parameters = [])
+    public function labels($group_id, array $parameters = [])
     {
         $resolver = $this->createOptionsResolver();
 
         return $this->get('groups/'.self::encodePath($group_id).'/labels', $resolver->resolve($parameters));
     }
 
     /**
-     * @param int   $group_id
-     * @param array $params
+     * @param int|string $group_id
+     * @param array      $params
      *
      * @return mixed
      */
-    public function addLabel(int $group_id, array $params)
+    public function addLabel($group_id, array $params)
     {
         return $this->post('groups/'.self::encodePath($group_id).'/labels', $params);
     }
 
     /**
-     * @param int   $group_id
-     * @param array $params
+     * @param int|string $group_id
+     * @param array      $params
      *
      * @return mixed
      */
-    public function updateLabel(int $group_id, array $params)
+    public function updateLabel($group_id, array $params)
     {
         return $this->put('groups/'.self::encodePath($group_id).'/labels', $params);
     }
 
     /**
-     * @param int    $group_id
-     * @param string $name
+     * @param int|string $group_id
+     * @param string     $name
      *
      * @return mixed
      */
-    public function removeLabel(int $group_id, string $name)
+    public function removeLabel($group_id, string $name)
     {
         return $this->delete('groups/'.self::encodePath($group_id).'/labels', [
             'name' => $name,
         ]);
     }
 
     /**
-     * @param int   $group_id
-     * @param array $parameters
+     * @param int|string $group_id
+     * @param array      $parameters
      *
      * @return mixed
      */
-    public function variables(int $group_id, array $parameters = [])
+    public function variables($group_id, array $parameters = [])
     {
         $resolver = $this->createOptionsResolver();
 
         return $this->get('groups/'.self::encodePath($group_id).'/variables', $resolver->resolve($parameters));
     }
 
     /**
-     * @param int    $group_id
-     * @param string $key
+     * @param int|string $group_id
+     * @param string     $key
      *
      * @return mixed
      */
-    public function variable(int $group_id, string $key)
+    public function variable($group_id, string $key)
     {
         return $this->get('groups/'.self::encodePath($group_id).'/variables/'.self::encodePath($key));
     }
 
     /**
-     * @param int       $group_id
-     * @param string    $key
-     * @param string    $value
-     * @param bool|null $protected
+     * @param int|string $group_id
+     * @param string     $key
+     * @param string     $value
+     * @param bool|null  $protected
      *
      * @return mixed
      */
-    public function addVariable(int $group_id, string $key, string $value, ?bool $protected = null)
+    public function addVariable($group_id, string $key, string $value, ?bool $protected = null)
     {
         $payload = [
             'key' => $key,
@@ -380,14 +380,14 @@ public function addVariable(int $group_id, string $key, string $value, ?bool $pr
     }
 
     /**
-     * @param int       $group_id
-     * @param string    $key
-     * @param string    $value
-     * @param bool|null $protected
+     * @param int|string $group_id
+     * @param string     $key
+     * @param string     $value
+     * @param bool|null  $protected
      *
      * @return mixed
      */
-    public function updateVariable(int $group_id, string $key, string $value, ?bool $protected = null)
+    public function updateVariable($group_id, string $key, string $value, ?bool $protected = null)
     {
         $payload = [
             'value' => $value,
@@ -401,12 +401,12 @@ public function updateVariable(int $group_id, string $key, string $value, ?bool
     }
 
     /**
-     * @param int    $group_id
-     * @param string $key
+     * @param int|string $group_id
+     * @param string     $key
      *
      * @return mixed
      */
-    public function removeVariable(int $group_id, string $key)
+    public function removeVariable($group_id, string $key)
     {
         return $this->delete('groups/'.self::encodePath($group_id).'/variables/'.self::encodePath($key));
     }