Merge branch '10.4' into 11.0

GitLabPHP · Dec 22, 2020 · c1aabba · c1aabba
2 parents 9f6c0d2 + 27336fb
commit c1aabba
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [11.0.0-RC1] - UPCOMING
+## [11.0.0] - UPCOMING
 
 * Removed models API
 * Dropped support for PHP 7.1
@@ -15,13 +15,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Client authenticate and setUrl now return void
 * Added additional return type enforcement
 
-[11.0.0-RC1]: https://github.com/GitLabPHP/Client/compare/10.4.0...11.0.0-RC1
+[11.0.0]: https://github.com/GitLabPHP/Client/compare/10.4.0...11.0.0
 
-## [10.4.0] - UPCOMING
+## [10.4.0] - 2020-12-22
 
 [10.4.0]: https://github.com/GitLabPHP/Client/compare/10.3.1...10.4.0
 
 * Add min_access_level option to group search
+* Added support for additional issue order clauses
+* Added params array to remove user method to support hard_delete
 
 ## [10.3.1] - 2020-12-04
 

diff --git a/src/Api/Issues.php b/src/Api/Issues.php
@@ -455,7 +455,7 @@ protected function createOptionsResolver(): OptionsResolver
             ->setAllowedValues('scope', ['created-by-me', 'assigned-to-me', 'all'])
         ;
         $resolver->setDefined('order_by')
-            ->setAllowedValues('order_by', ['created_at', 'updated_at'])
+            ->setAllowedValues('order_by', ['created_at', 'updated_at', 'priority', 'due_date', 'relative_position', 'label_priority', 'milestone_due', 'popularity', 'weight'])
         ;
         $resolver->setDefined('sort')
             ->setAllowedValues('sort', ['asc', 'desc'])

diff --git a/src/Api/Users.php b/src/Api/Users.php
@@ -191,13 +191,18 @@ public function update(int $id, array $params, array $files = [])
     }
 
     /**
-     * @param int $id
+     * @param int   $id
+     * @param array $params {
+     *
+     *     @var bool   $hard_delete     If true, contributions that would usually be moved to the ghost user are
+     *                                  deleted instead, as well as groups owned solely by this user.
+     * }
      *
      * @return mixed
      */
-    public function remove(int $id)
+    public function remove(int $id, array $params = [])
     {
-        return $this->delete('users/'.self::encodePath($id));
+        return $this->delete('users/'.self::encodePath($id), $params);
     }
 
     /**