Skip to content

Commit a126f12

Browse files
authored
Merge pull request #113 from apisearch-io/fix/fixed-range-infinite
Infinite should be defined as null
2 parents 979fb54 + 68cc53b commit a126f12

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

Query/Range.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ class Range
2525
*
2626
* zero
2727
*/
28-
const ZERO = 0;
28+
const MINUS_INFINITE = null;
2929

3030
/**
3131
* @var int
3232
*
3333
* Infinite
3434
*/
35-
const INFINITE = -1;
35+
const INFINITE = null;
3636

3737
/**
3838
* @var string
@@ -52,7 +52,7 @@ public static function stringToArray(string $string): array
5252
{
5353
list($from, $to) = explode(self::SEPARATOR, $string);
5454
$from = empty($from)
55-
? self::ZERO
55+
? self::MINUS_INFINITE
5656
: (is_numeric($from)
5757
? (int) $from
5858
: $from);
@@ -75,7 +75,7 @@ public static function stringToArray(string $string): array
7575
*/
7676
public static function arrayToString(array $values): string
7777
{
78-
if (self::ZERO == $values[0]) {
78+
if (self::MINUS_INFINITE == $values[0]) {
7979
$values[0] = '';
8080
}
8181
if (self::INFINITE == $values[1]) {

Tests/Query/RangeTest.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,9 @@ public function dataStringToArray(): array
4848
{
4949
return [
5050
['2..5', [2, 5]],
51-
['..10', [Range::ZERO, 10]],
52-
['0..', [Range::ZERO, Range::INFINITE]],
53-
['2..-1', [2, Range::INFINITE]],
51+
['..10', [Range::MINUS_INFINITE, 10]],
5452
['2..', [2, Range::INFINITE]],
55-
['..', [Range::ZERO, Range::INFINITE]],
53+
['..', [Range::MINUS_INFINITE, Range::INFINITE]],
5654
];
5755
}
5856

@@ -81,9 +79,9 @@ public function dataArrayToString(): array
8179
{
8280
return [
8381
[[2, 6], '2..6'],
84-
[[Range::ZERO, 10], '..10'],
82+
[[Range::MINUS_INFINITE, 10], '..10'],
8583
[[2, Range::INFINITE], '2..'],
86-
[[Range::ZERO, Range::INFINITE], '..'],
84+
[[Range::MINUS_INFINITE, Range::INFINITE], '..'],
8785
];
8886
}
8987

0 commit comments

Comments
 (0)