Skip to content

Commit c753938

Browse files
Samuel Nogueirascaytrase
Samuel Nogueira
authored andcommitted
Removed 'positive' validation for minimum and maximum schema values
1 parent 5749a37 commit c753938

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

src/Schema/Keywords/Maximum.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ public function validate($data, $maximum, bool $exclusiveMaximum = false): void
4444
try {
4545
if (class_exists(NumericVal::class)) {
4646
Validator::numericVal()->assert($data);
47-
Validator::numericVal()->positive()->assert($maximum);
47+
Validator::numericVal()->assert($maximum);
4848
} else {
4949
Validator::numeric()->assert($data);
50-
Validator::numeric()->positive()->assert($maximum);
50+
Validator::numeric()->assert($maximum);
5151
}
5252
} catch (Exception | ExceptionInterface $e) {
5353
throw InvalidSchema::becauseDefensiveSchemaValidationFailed($e);

src/Schema/Keywords/Minimum.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ public function validate($data, $minimum, bool $exclusiveMinimum = false): void
4444
try {
4545
if (class_exists(NumericVal::class)) {
4646
Validator::numericVal()->assert($data);
47-
Validator::numericVal()->positive()->assert($minimum);
47+
Validator::numericVal()->assert($minimum);
4848
} else {
4949
Validator::numeric()->assert($data);
50-
Validator::numeric()->positive()->assert($minimum);
50+
Validator::numeric()->assert($minimum);
5151
}
5252
} catch (Exception | ExceptionInterface $e) {
5353
throw InvalidSchema::becauseDefensiveSchemaValidationFailed($e);

tests/Schema/Keywords/MaximumTest.php

+7-3
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,20 @@
1010

1111
final class MaximumTest extends SchemaValidatorTest
1212
{
13-
public function testMaximumNonexclusiveKeywordGreen(): void
13+
/**
14+
* @testWith [100]
15+
* [0]
16+
* [-1]
17+
*/
18+
public function testMaximumNonexclusiveKeywordGreen(int $data): void
1419
{
1520
$spec = <<<SPEC
1621
schema:
1722
type: number
18-
maximum: 100
23+
maximum: {$data}
1924
SPEC;
2025

2126
$schema = $this->loadRawSchema($spec);
22-
$data = 100;
2327

2428
(new SchemaValidator())->validate($data, $schema);
2529
$this->addToAssertionCount(1);

tests/Schema/Keywords/MinimumTest.php

+7-3
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,20 @@
1010

1111
final class MinimumTest extends SchemaValidatorTest
1212
{
13-
public function testMinimumNonexclusiveKeywordGreen(): void
13+
/**
14+
* @testWith [100]
15+
* [0]
16+
* [-1]
17+
*/
18+
public function testMinimumNonexclusiveKeywordGreen(int $data): void
1419
{
1520
$spec = <<<SPEC
1621
schema:
1722
type: number
18-
minimum: 100
23+
minimum: {$data}
1924
SPEC;
2025

2126
$schema = $this->loadRawSchema($spec);
22-
$data = 100;
2327

2428
(new SchemaValidator())->validate($data, $schema);
2529
$this->addToAssertionCount(1);

0 commit comments

Comments
 (0)