⚠ This page is served via a proxy. Original site: https://github.com
This service does not collect credentials or authentication data.
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Doctrine/Odm/Filter/OrderFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,6 @@ protected function filterProperty(string $property, mixed $value, Builder $aggre
*/
public function getSchema(Parameter $parameter): array
{
return ['type' => 'string', 'enum' => ['asc', 'desc']];
return ['type' => 'string', 'enum' => ['asc', 'desc', 'ASC', 'DESC']];
}
}
2 changes: 1 addition & 1 deletion src/Doctrine/Orm/Filter/OrderFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,6 @@ protected function filterProperty(string $property, mixed $value, QueryBuilder $
*/
public function getSchema(Parameter $parameter): array
{
return ['type' => 'string', 'enum' => ['asc', 'desc']];
return ['type' => 'string', 'enum' => ['asc', 'desc', 'ASC', 'DESC']];
}
}
2 changes: 1 addition & 1 deletion src/Laravel/Eloquent/Filter/OrderFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function apply(Builder $builder, mixed $values, Parameter $parameter, arr
*/
public function getSchema(Parameter $parameter): array
{
return ['type' => 'string', 'enum' => ['asc', 'desc']];
return ['type' => 'string', 'enum' => ['asc', 'desc', 'ASC', 'DESC']];
}

/**
Expand Down
16 changes: 16 additions & 0 deletions tests/Functional/Parameters/OrderFilterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@ public static function orderFilterScenariosProvider(): \Generator
'/filtered_order_parameters?createdAt=desc',
['2024-12-25T00:00:00+00:00', '2024-06-15T00:00:00+00:00', '2024-01-01T00:00:00+00:00', null],
];
yield 'created_at_ordered_asc_uppercase' => [
'/filtered_order_parameters?createdAt=ASC',
[null, '2024-01-01T00:00:00+00:00', '2024-06-15T00:00:00+00:00', '2024-12-25T00:00:00+00:00'],
];
yield 'created_at_ordered_desc_uppercase' => [
'/filtered_order_parameters?createdAt=DESC',
['2024-12-25T00:00:00+00:00', '2024-06-15T00:00:00+00:00', '2024-01-01T00:00:00+00:00', null],
];
yield 'date_alias_ordered_asc' => [
'/filtered_order_parameters?date=asc',
[null, '2024-01-01T00:00:00+00:00', '2024-06-15T00:00:00+00:00', '2024-12-25T00:00:00+00:00'],
Expand Down Expand Up @@ -132,6 +140,14 @@ public static function orderFilterNullsComparisonScenariosProvider(): \Generator
'/filtered_order_parameters?order[createdAt]=desc',
[null, '2024-12-25T00:00:00+00:00', '2024-06-15T00:00:00+00:00', '2024-01-01T00:00:00+00:00'],
];
yield 'order_property_created_at_null_first_asc_uppercase' => [
'/filtered_order_parameters?order[createdAt]=ASC',
[null, '2024-01-01T00:00:00+00:00', '2024-06-15T00:00:00+00:00', '2024-12-25T00:00:00+00:00'],
];
yield 'order_property_created_at_null_first_desc_uppercase' => [
'/filtered_order_parameters?order[createdAt]=DESC',
[null, '2024-12-25T00:00:00+00:00', '2024-06-15T00:00:00+00:00', '2024-01-01T00:00:00+00:00'],
];
}

/**
Expand Down
Loading