From 51004598e82b91f6b5d23a0a293f3bac0ac29ff8 Mon Sep 17 00:00:00 2001 From: Jefferson Martin Date: Mon, 21 Dec 2020 12:11:28 -0800 Subject: [PATCH 1/4] [10.4] Update Users remove method to add params array to support hard_delete (#607) Co-authored-by: Jeff Martin --- CHANGELOG.md | 1 + src/Api/Users.php | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cb610996..53c50fae8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [10.4.0]: https://github.com/GitLabPHP/Client/compare/10.3.1...10.4.0 * Add min_access_level option to group search +* Added params array to remove user method to support hard_delete ## [10.3.1] - 2020-12-04 diff --git a/src/Api/Users.php b/src/Api/Users.php index f0f9ef4ed..b455c9dd4 100644 --- a/src/Api/Users.php +++ b/src/Api/Users.php @@ -181,13 +181,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); } /** From 57e7bf264175b6890e9ac168d7d477b06b473238 Mon Sep 17 00:00:00 2001 From: David Windell Date: Mon, 21 Dec 2020 20:12:16 +0000 Subject: [PATCH 2/4] Add issue order clauses (#609) --- src/Api/Issues.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Api/Issues.php b/src/Api/Issues.php index 59720f374..db1c3d08c 100644 --- a/src/Api/Issues.php +++ b/src/Api/Issues.php @@ -444,7 +444,7 @@ protected function createOptionsResolver() ->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']) From 753f2fa0e83260da1a1c910799df76af31b34982 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 21 Dec 2020 20:12:59 +0000 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53c50fae8..e28fc70be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [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 From 27336fb60abeeda5f4a391b60f2d31c322021802 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Tue, 22 Dec 2020 00:19:35 +0000 Subject: [PATCH 4/4] Release 10.4.0 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e28fc70be..230d2410b 100644 --- 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). -## [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