List all members of a group or project including inherited members with optional user id filter

Author: SirFlip

lib/Gitlab/Api/Groups.php

@@ -91,15 +91,16 @@ public function transfer($group_id, $project_id)
 
     /**
      * @param integer $id
+     * @param integer|null $user_id
      * @param array $parameters
      * @return mixed
      */
-    public function allMembers($id, array $parameters = [])
+    public function allMembers($id, $user_id = null, array $parameters = [])
     {
         $resolver = $this->createOptionsResolver();
         $resolver->setDefined('query');
 
-        return $this->get('groups/'.$this->encodePath($id).'/members/all', $resolver->resolve($parameters));
+        return $this->get('groups/'.$this->encodePath($id).'/members/all/'.$this->encodePath($user_id), $resolver->resolve($parameters));
     }
 
     /**

lib/Gitlab/Api/Projects.php

@@ -297,18 +297,19 @@ public function deletePipeline($project_id, $pipeline_id)
     {
         return $this->delete($this->getProjectPath($project_id, 'pipelines/'.$this->encodePath($pipeline_id)));
     }
-    
+
     /**
      * @param integer $project_id
+     * @param integer|null $user_id
      * @param array $parameters
      * @return mixed
      */
-    public function allMembers($project_id, $parameters = [])
+    public function allMembers($project_id, $user_id = null, $parameters = [])
     {
         $resolver = $this->createOptionsResolver();
         $resolver->setDefined('query');
 
-        return $this->get('projects/'.$this->encodePath($project_id).'/members/all', $resolver->resolve($parameters));
+        return $this->get('projects/'.$this->encodePath($project_id).'/members/all/'.$this->encodePath($user_id), $resolver->resolve($parameters));
     }
 
     /**