Merge branch '9.19' into 10.0

Author: GrahamCampbell

lib/Gitlab/Api/Groups.php

@@ -103,34 +103,45 @@ public function transfer($group_id, $project_id)
     }
 
     /**
-     * @param int   $id
+     * @param int   $group_id
      * @param array $parameters
      *
      * @return mixed
      */
-    public function allMembers($id, array $parameters = [])
+    public function allMembers($group_id, array $parameters = [])
     {
         $resolver = $this->createOptionsResolver();
         $resolver->setDefined('query');
 
-        return $this->get('groups/'.self::encodePath($id).'/members/all', $resolver->resolve($parameters));
+        return $this->get('groups/'.self::encodePath($group_id).'/members/all', $resolver->resolve($parameters));
     }
 
     /**
-     * @param int   $id
+     * @param int   $group_id
      * @param array $parameters {
      *
      *     @var string $query A query string to search for members.
      * }
      *
      * @return mixed
      */
-    public function members($id, array $parameters = [])
+    public function members($group_id, array $parameters = [])
     {
         $resolver = $this->createOptionsResolver();
         $resolver->setDefined('query');
 
-        return $this->get('groups/'.self::encodePath($id).'/members', $resolver->resolve($parameters));
+        return $this->get('groups/'.self::encodePath($group_id).'/members', $resolver->resolve($parameters));
+    }
+
+    /**
+     * @param int $group_id
+     * @param int $user_id
+     *
+     * @return mixed
+     */
+    public function member($group_id, $user_id)
+    {
+        return $this->get('groups/'.self::encodePath($group_id).'/members/'.self::encodePath($user_id));
     }
 
     /**