Skip to content

feat(doctrine): allow for comma-separated values in numeric-filter #6720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

feat(doctrine): allow for comma-separated values in numeric-filter #6720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions src/Doctrine/Common/Filter/NumericFilterTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ protected function isNumericField(string $property, string $resourceClass): bool

protected function normalizeValues($value, string $property): ?array
{
// Allow CSV format for multiple values.
if (\is_string($value) && str_contains($value, ',')) {
$value = explode(',', $value);
}

if (!is_numeric($value) && (!\is_array($value) || !$this->isNumericArray($value))) {
$this->getLogger()->notice('Invalid filter ignored', [
'exception' => new InvalidArgumentException(\sprintf('Invalid numeric value for "%s" property', $property)),
Expand Down
3 changes: 3 additions & 0 deletions src/Doctrine/Orm/Tests/Filter/NumericFilterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ public static function provideApplyTestData(): array
'numeric string (positive integer)' => [
\sprintf('SELECT o FROM %s o WHERE o.dummyPrice = :dummyPrice_p1', Dummy::class),
],
'comma-separated numeric string (positive integer)' => [
\sprintf('SELECT o FROM %s o WHERE o.dummyPrice IN (:dummyPrice_p1)', Dummy::class),
],
'multiple numeric string (positive integer)' => [
\sprintf('SELECT o FROM %s o WHERE o.dummyPrice IN (:dummyPrice_p1)', Dummy::class),
],
Expand Down
10 changes: 10 additions & 0 deletions src/Doctrine/Orm/Tests/Filter/NumericFilterTestTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,16 @@ private static function provideApplyTestArguments(): array
'dummyPrice' => '21',
],
],
'comma-separated numeric string (positive integer)' => [
[
'id' => null,
'name' => null,
'dummyPrice' => null,
],
[
'dummyPrice' => ['21,22'],
],
],
'multiple numeric string (positive integer)' => [
[
'id' => null,
Expand Down
Loading