Skip to content

Commit

Permalink
Rename notANumberMessage to notNumberMessage (#407)
Browse files Browse the repository at this point in the history
  • Loading branch information
@vjik
vjik committed Nov 30, 2022
1 parent c9e2530 commit fac319e
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 42 deletions.
6 changes: 3 additions & 3 deletions src/Rule/Number.php
View file
Expand Up @@ -123,7 +123,7 @@ public function getNumberPattern(): string
return $this->numberPattern;
}

public function getNotANumberMessage(): string
public function getNotNumberMessage(): string
{
return $this->asInteger ? 'Value must be an integer.' : 'Value must be a number.';
}
Expand All @@ -138,8 +138,8 @@ public function getOptions(): array
'template' => $this->incorrectInputMessage,
'parameters' => [],
],
'notANumberMessage' => [
'template' => $this->getNotANumberMessage(),
'notNumberMessage' => [
'template' => $this->getNotNumberMessage(),
'parameters' => [],
],
'tooSmallMessage' => [
Expand Down
2 changes: 1 addition & 1 deletion src/Rule/NumberHandler.php
View file
Expand Up @@ -41,7 +41,7 @@ public function validate(mixed $value, object $rule, ValidationContext $context)
$pattern = $rule->isAsInteger() ? $rule->getIntegerPattern() : $rule->getNumberPattern();

if (!preg_match($pattern, NumericHelper::normalize($value))) {
$result->addError($rule->getNotANumberMessage(), [
$result->addError($rule->getNotNumberMessage(), [
'attribute' => $context->getAttribute(),
'value' => $value,
]);
Expand Down
2 changes: 1 addition & 1 deletion src/RulesDumper.php
View file
Expand Up @@ -30,7 +30,7 @@ final class RulesDumper
* 'number',
* 'integer' => true,
* 'max' => 100,
* 'notANumberMessage' => ['template' => 'Value must be an integer.', 'parameters' => []],
* 'notNumberMessage' => ['template' => 'Value must be an integer.', 'parameters' => []],
* 'tooBigMessage' => ['template' => 'Value must be no greater than 100.', 'parameters' => []],
* ],
* ['callback'],
Expand Down
6 changes: 3 additions & 3 deletions tests/Rule/CompositeTest.php
View file
Expand Up @@ -49,7 +49,7 @@ public function dataOptions(): array
'template' => 'The allowed types are integer, float and string.',
'parameters' => [],
],
'notANumberMessage' => [
'notNumberMessage' => [
'template' => 'Value must be a number.',
'parameters' => [],
],
Expand All @@ -75,7 +75,7 @@ public function dataOptions(): array
'template' => 'The allowed types are integer, float and string.',
'parameters' => [],
],
'notANumberMessage' => [
'notNumberMessage' => [
'template' => 'Value must be a number.',
'parameters' => [],
],
Expand Down Expand Up @@ -113,7 +113,7 @@ public function dataOptions(): array
'template' => 'The allowed types are integer, float and string.',
'parameters' => [],
],
'notANumberMessage' => [
'notNumberMessage' => [
'template' => 'Value must be a number.',
'parameters' => [],
],
Expand Down
6 changes: 3 additions & 3 deletions tests/Rule/EachTest.php
View file
Expand Up @@ -57,7 +57,7 @@ public function dataOptions(): array
'template' => 'The allowed types are integer, float and string.',
'parameters' => [],
],
'notANumberMessage' => [
'notNumberMessage' => [
'template' => 'Value must be a number.',
'parameters' => [],
],
Expand All @@ -83,7 +83,7 @@ public function dataOptions(): array
'template' => 'The allowed types are integer, float and string.',
'parameters' => [],
],
'notANumberMessage' => [
'notNumberMessage' => [
'template' => 'Value must be a number.',
'parameters' => [],
],
Expand Down Expand Up @@ -129,7 +129,7 @@ public function dataOptions(): array
'template' => 'The allowed types are integer, float and string.',
'parameters' => [],
],
'notANumberMessage' => [
'notNumberMessage' => [
'template' => 'Value must be a number.',
'parameters' => [],
],
Expand Down
4 changes: 2 additions & 2 deletions tests/Rule/NestedTest.php
View file
Expand Up @@ -120,7 +120,7 @@ public function dataOptions(): array
'template' => 'The allowed types are integer, float and string.',
'parameters' => [],
],
'notANumberMessage' => [
'notNumberMessage' => [
'template' => 'Value must be a number.',
'parameters' => [],
],
Expand Down Expand Up @@ -172,7 +172,7 @@ public function dataOptions(): array
'template' => 'The allowed types are integer, float and string.',
'parameters' => [],
],
'notANumberMessage' => [
'notNumberMessage' => [
'template' => 'Value must be a number.',
'parameters' => [],
],
Expand Down
56 changes: 28 additions & 28 deletions tests/Rule/NumberTest.php
View file
Expand Up @@ -39,7 +39,7 @@ public function dataOptions(): array
'template' => 'The allowed types are integer, float and string.',
'parameters' => [],
],
'notANumberMessage' => [
'notNumberMessage' => [
'template' => 'Value must be a number.',
'parameters' => [],
],
Expand Down Expand Up @@ -67,7 +67,7 @@ public function dataOptions(): array
'template' => 'The allowed types are integer, float and string.',
'parameters' => [],
],
'notANumberMessage' => [
'notNumberMessage' => [
'template' => 'Value must be a number.',
'parameters' => [],
],
Expand Down Expand Up @@ -95,7 +95,7 @@ public function dataOptions(): array
'template' => 'The allowed types are integer, float and string.',
'parameters' => [],
],
'notANumberMessage' => [
'notNumberMessage' => [
'template' => 'Value must be a number.',
'parameters' => [],
],
Expand Down Expand Up @@ -123,7 +123,7 @@ public function dataOptions(): array
'template' => 'The allowed types are integer, float and string.',
'parameters' => [],
],
'notANumberMessage' => [
'notNumberMessage' => [
'template' => 'Value must be a number.',
'parameters' => [],
],
Expand Down Expand Up @@ -151,7 +151,7 @@ public function dataOptions(): array
'template' => 'The allowed types are integer, float and string.',
'parameters' => [],
],
'notANumberMessage' => [
'notNumberMessage' => [
'template' => 'Value must be an integer.',
'parameters' => [],
],
Expand Down Expand Up @@ -214,8 +214,8 @@ public function dataValidationPassed(): array
public function dataValidationFailed(): array
{
$incorrectInputMessage = 'The allowed types are integer, float and string.';
$notANumberMessage = 'Value must be a number.';
$notAnIntegerMessage = 'Value must be an integer.';
$notNumberMessage = 'Value must be a number.';
$notIntegerMessage = 'Value must be an integer.';

return [
[false, [new Number()], ['' => [$incorrectInputMessage]]],
Expand All @@ -224,42 +224,42 @@ public function dataValidationFailed(): array
[new stdClass(), [new Number()], ['' => [$incorrectInputMessage]]],
[fopen('php://stdin', 'rb'), [new Number()], ['' => [$incorrectInputMessage]]],

['12:45', [new Number()], ['' => [$notANumberMessage]]],
['e12', [new Number()], ['' => [$notANumberMessage]]],
['-e3', [new Number()], ['' => [$notANumberMessage]]],
['-4.534-e-12', [new Number()], ['' => [$notANumberMessage]]],
['12.23^4', [new Number()], ['' => [$notANumberMessage]]],
['43^32', [new Number()], ['' => [$notANumberMessage]]],
['12:45', [new Number()], ['' => [$notNumberMessage]]],
['e12', [new Number()], ['' => [$notNumberMessage]]],
['-e3', [new Number()], ['' => [$notNumberMessage]]],
['-4.534-e-12', [new Number()], ['' => [$notNumberMessage]]],
['12.23^4', [new Number()], ['' => [$notNumberMessage]]],
['43^32', [new Number()], ['' => [$notNumberMessage]]],

[25.45, [new Number(asInteger: true)], ['' => [$notAnIntegerMessage]]],
['25,45', [new Number(asInteger: true)], ['' => [$notAnIntegerMessage]]],
['0x14', [new Number(asInteger: true)], ['' => [$notAnIntegerMessage]]],
[25.45, [new Number(asInteger: true)], ['' => [$notIntegerMessage]]],
['25,45', [new Number(asInteger: true)], ['' => [$notIntegerMessage]]],
['0x14', [new Number(asInteger: true)], ['' => [$notIntegerMessage]]],

['-1.23', [new Number(asInteger: true)], ['' => [$notAnIntegerMessage]]],
['-4.423e-12', [new Number(asInteger: true)], ['' => [$notAnIntegerMessage]]],
['12E3', [new Number(asInteger: true)], ['' => [$notAnIntegerMessage]]],
['e12', [new Number(asInteger: true)], ['' => [$notAnIntegerMessage]]],
['-e3', [new Number(asInteger: true)], ['' => [$notAnIntegerMessage]]],
['-4.534-e-12', [new Number(asInteger: true)], ['' => [$notAnIntegerMessage]]],
['12.23^4', [new Number(asInteger: true)], ['' => [$notAnIntegerMessage]]],
['-1.23', [new Number(asInteger: true)], ['' => [$notIntegerMessage]]],
['-4.423e-12', [new Number(asInteger: true)], ['' => [$notIntegerMessage]]],
['12E3', [new Number(asInteger: true)], ['' => [$notIntegerMessage]]],
['e12', [new Number(asInteger: true)], ['' => [$notIntegerMessage]]],
['-e3', [new Number(asInteger: true)], ['' => [$notIntegerMessage]]],
['-4.534-e-12', [new Number(asInteger: true)], ['' => [$notIntegerMessage]]],
['12.23^4', [new Number(asInteger: true)], ['' => [$notIntegerMessage]]],

[-1, [new Number(min: 1)], ['' => ['Value must be no less than 1.']]],
['22e-12', [new Number(min: 1)], ['' => ['Value must be no less than 1.']]],

[-1, [new Number(asInteger: true, min: 1)], ['' => ['Value must be no less than 1.']]],
['22e-12', [new Number(asInteger: true, min: 1)], ['' => [$notAnIntegerMessage]]],
['22e-12', [new Number(asInteger: true, min: 1)], ['' => [$notIntegerMessage]]],
[1.5, [new Number(max: 1.25)], ['' => ['Value must be no greater than 1.25.']]],

// TODO: fix wrong message
[1.5, [new Number(asInteger: true, max: 1.25)], ['' => [$notAnIntegerMessage]]],
['22e-12', [new Number(asInteger: true, max: 1.25)], ['' => [$notAnIntegerMessage]]],
['125e-2', [new Number(asInteger: true, max: 1.25)], ['' => [$notAnIntegerMessage]]],
[1.5, [new Number(asInteger: true, max: 1.25)], ['' => [$notIntegerMessage]]],
['22e-12', [new Number(asInteger: true, max: 1.25)], ['' => [$notIntegerMessage]]],
['125e-2', [new Number(asInteger: true, max: 1.25)], ['' => [$notIntegerMessage]]],

[-11, [new Number(min: -10, max: 20)], ['' => ['Value must be no less than -10.']]],
[21, [new Number(min: -10, max: 20)], ['' => ['Value must be no greater than 20.']]],
[-11, [new Number(asInteger: true, min: -10, max: 20)], ['' => ['Value must be no less than -10.']]],
[22, [new Number(asInteger: true, min: -10, max: 20)], ['' => ['Value must be no greater than 20.']]],
['20e-1', [new Number(asInteger: true, min: -10, max: 20)], ['' => [$notAnIntegerMessage]]],
['20e-1', [new Number(asInteger: true, min: -10, max: 20)], ['' => [$notIntegerMessage]]],
'custom error' => [
0,
[new Number(min: 5, tooSmallMessage: 'Value is too small.')],
Expand Down
2 changes: 1 addition & 1 deletion tests/RulesDumperTest.php
View file
Expand Up @@ -43,7 +43,7 @@ public function asArrayDataProvider(): array
'template' => 'The allowed types are integer, float and string.',
'parameters' => [],
],
'notANumberMessage' => [
'notNumberMessage' => [
'template' => 'Value must be an integer.',
'parameters' => [],
],
Expand Down

0 comments on commit fac319e

Please sign in to comment.