Skip to content

return original value when no cast #535

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

Merged
merged 2 commits into from
Oct 19, 2018
Merged

return original value when no cast #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01ec771
return original value when no cast
shmax Sep 26, 2018
a754bd3
linting
shmax Oct 3, 2018
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: 2 additions & 0 deletions src/JsonSchema/Constraints/TypeConstraint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,8 @@ protected function toString($value)
if ($this->getTypeCheck()->isArray($value) && count($value) === 1) {
return $this->toString(reset($value));
}

return $value;
}

/**
Expand Down
77 changes: 39 additions & 38 deletions tests/Constraints/CoerciveTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,55 +39,49 @@ public function dataCoerceCases()
array('array', '[45]', '45', true), // #5
array('object', '{"a":"b"}', null, false), // #6
array('array', '[{"a":"b"}]', null, false), // #7
array('array', '[1,2]', array(1, 2), false), // #8
),
'integer' => array(
array('string', '"45"', 45, true), // #8
array('integer', '45', 45, true), // #9
array('boolean', 'true', 1, true), // #10
array('boolean', 'false', 0, true), // #11
array('NULL', 'null', 0, true), // #12
array('array', '["-45"]', -45, true), // #13
array('object', '{"a":"b"}', null, false), // #14
array('array', '["ABC"]', null, false), // #15
array('string', '"45"', 45, true), // #9
array('integer', '45', 45, true), // #10
array('boolean', 'true', 1, true), // #11
array('boolean', 'false', 0, true), // #12
array('NULL', 'null', 0, true), // #13
array('array', '["-45"]', -45, true), // #14
array('object', '{"a":"b"}', null, false), // #15
array('array', '["ABC"]', null, false), // #16
),
'boolean' => array(
array('string', '"true"', true, true), // #16
array('integer', '1', true, true), // #17
array('boolean', 'true', true, true), // #18
array('NULL', 'null', false, true), // #19
array('array', '["true"]', true, true), // #20
array('object', '{"a":"b"}', null, false), // #21
array('string', '""', null, false), // #22
array('string', '"ABC"', null, false), // #23
array('integer', '2', null, false), // #24
array('string', '"true"', true, true), // #17
array('integer', '1', true, true), // #18
array('boolean', 'true', true, true), // #19
array('NULL', 'null', false, true), // #20
array('array', '["true"]', true, true), // #21
array('object', '{"a":"b"}', null, false), // #22
array('string', '""', null, false), // #23
array('string', '"ABC"', null, false), // #24
array('integer', '2', null, false), // #25
),
'NULL' => array(
array('string', '""', null, true), // #25
array('integer', '0', null, true), // #26
array('boolean', 'false', null, true), // #27
array('NULL', 'null', null, true), // #28
array('array', '[0]', null, true), // #29
array('object', '{"a":"b"}', null, false), // #30
array('string', '"null"', null, false), // #31
array('integer', '-1', null, false), // #32
array('string', '""', null, true), // #26
array('integer', '0', null, true), // #27
array('boolean', 'false', null, true), // #28
array('NULL', 'null', null, true), // #29
array('array', '[0]', null, true), // #30
array('object', '{"a":"b"}', null, false), // #31
array('string', '"null"', null, false), // #32
array('integer', '-1', null, false), // #33
),
'array' => array(
array('string', '"ABC"', array('ABC'), true), // #33
array('integer', '45', array(45), true), // #34
array('boolean', 'true', array(true), true), // #35
array('NULL', 'null', array(null), true), // #36
array('array', '["ABC"]', array('ABC'), true), // #37
array('object', '{"a":"b"}', null, false), // #38
array('string', '"ABC"', array('ABC'), true), // #34
array('integer', '45', array(45), true), // #35
array('boolean', 'true', array(true), true), // #36
array('NULL', 'null', array(null), true), // #37
array('array', '["ABC"]', array('ABC'), true), // #38
array('object', '{"a":"b"}', null, false), // #39
),
);

// #39 check post-coercion validation (to array)
$tests[] = array(
'{"properties":{"propertyOne":{"type":"array","items":[{"type":"number"}]}}}',
'{"propertyOne":"ABC"}',
'string', null, null, false
);

// #40 check multiple types (first valid)
$tests[] = array(
'{"properties":{"propertyOne":{"type":["number", "string"]}}}',
Expand Down Expand Up @@ -172,6 +166,13 @@ public function dataCoerceCases()
'string', 'boolean', false, true
);

// #52 check post-coercion validation (to array)
$tests[] = array(
'{"properties":{"propertyOne":{"type":"array","items":[{"type":"number"}]}}}',
'{"propertyOne":"ABC"}',
'string', null, null, false
);

foreach ($types as $toType => $testCases) {
foreach ($testCases as $testCase) {
$tests[] = array(
Expand Down