Skip to content

Commit 6e409e8

Browse files
committed
move sort option outside createOptionsResolver
1 parent df9ddc3 commit 6e409e8

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

lib/Gitlab/Api/AbstractApi.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ protected function encodePath($path)
194194
}
195195

196196
/**
197-
* Create a new OptionsResolver with page, per_page and sort options.
197+
* Create a new OptionsResolver with page and per_page options.
198198
*
199199
* @return OptionsResolver
200200
*/
@@ -213,9 +213,6 @@ protected function createOptionsResolver()
213213
return $value > 0 && $value <= 100;
214214
})
215215
;
216-
$resolver->setDefined('sort')
217-
->setAllowedValues('sort', ['asc', 'desc'])
218-
;
219216

220217
return $resolver;
221218
}

lib/Gitlab/Api/MergeRequests.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ public function all($project_id, array $parameters = [])
5151
$resolver->setDefined('order_by')
5252
->setAllowedValues('order_by', ['created_at', 'updated_at'])
5353
;
54+
$resolver->setDefined('sort')
55+
->setAllowedValues('sort', ['asc', 'desc'])
56+
;
5457
$resolver->setDefined('milestone');
5558
$resolver->setDefined('view')
5659
->setAllowedValues('view', ['simple'])

lib/Gitlab/Api/Projects.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ public function all(array $parameters = [])
4545
$resolver->setDefined('order_by')
4646
->setAllowedValues('order_by', ['id', 'name', 'path', 'created_at', 'updated_at', 'last_activity_at'])
4747
;
48+
$resolver->setDefined('sort')
49+
->setAllowedValues('sort', ['asc', 'desc'])
50+
;
4851
$resolver->setDefined('search');
4952
$resolver->setDefined('simple')
5053
->setAllowedTypes('simple', 'bool')
@@ -187,6 +190,9 @@ public function pipelines($project_id, array $parameters = [])
187190
$resolver->setDefined('order_by')
188191
->setAllowedValues('order_by', ['id', 'status', 'ref', 'user_id'])
189192
;
193+
$resolver->setDefined('sort')
194+
->setAllowedValues('sort', ['asc', 'desc'])
195+
;
190196

191197
return $this->get($this->getProjectPath($project_id, 'pipelines'), $resolver->resolve($parameters));
192198
}

0 commit comments

Comments
 (0)