Commit e9ac599

authored

fix: ensure numeric issues in const are correctly evaluated (#805)

Fixes #778

1 parent fbb4049 commit e9ac599Copy full SHA for e9ac599

File tree

+29

-14

lines changed

+29

-14

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),`
`6`	`6`	`and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).`
`7`	`7`
`8`	`8`	`## [Unreleased]`
	`9`	`+### Fixed`
	`10`	`+- ensure numeric issues in const are correctly evaluated ([#805](https://github.com/jsonrainbow/json-schema/pull/805))`
`9`	`11`
`10`	`12`	`## [6.3.0] - 2025年03月14日`
`11`	`13`	`### Fixed`
`@@ -15,7 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0`
`15`	`17`
`16`	`18`	`## Changed`
`17`	`19`	`- replace icecave/parity with custom deep comparator ([#803](https://github.com/jsonrainbow/json-schema/pull/803))`
`18`		`--`
	`20`	`+`
`19`	`21`	`## [6.2.1] - 2025年03月06日`
`20`	`22`	`### Fixed`
`21`	`23`	`- allow items: true to pass validation ([#801](https://github.com/jsonrainbow/json-schema/pull/801))`

Lines changed: 12 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,16 +37,20 @@ public function check(&$element, $schema = null, ?JsonPointer $path = null, $i =`
`37`	`37`	`foreach ($schema->enum as $enum) {`
`38`	`38`	`$enumType = gettype($enum);`
`39`	`39`
`40`		`- if ($this->factory->getConfig(self::CHECK_MODE_TYPE_CAST) && $type === 'array' && $enumType === 'object') {`
`41`		`- if (DeepComparer::isEqual((object) $element, $enum)) {`
`42`		`- return;`
`43`		`- }`
	`40`	`+ if ($enumType === 'object'`
	`41`	`+ && $type === 'array'`
	`42`	`+ && $this->factory->getConfig(self::CHECK_MODE_TYPE_CAST)`
	`43`	`+ && DeepComparer::isEqual((object) $element, $enum)`
	`44`	`+ ) {`
	`45`	`+ return;`
`44`	`46`	`}`
`45`	`47`
`46`		`- if ($type === gettype($enum)) {`
`47`		`- if (DeepComparer::isEqual($element, $enum)) {`
`48`		`- return;`
`49`		`- }`
	`48`	`+ if (($type === $enumType) && DeepComparer::isEqual($element, $enum)) {`
	`49`	`+ return;`
	`50`	`+ }`
	`51`	`+`
	`52`	`+ if (is_numeric($element) && is_numeric($enum) && DeepComparer::isEqual((float) $element, (float) $enum)) {`
	`53`	`+ return;`
`50`	`54`	`}`
`51`	`55`	`}`
`52`	`56`

Lines changed: 14 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -162,19 +162,28 @@ public function getValidTests(): array`
`162`	`162`	`"type": "object",`
`163`	`163`	`"properties": {`
`164`	`164`	`"value": {`
`165`		`- "type": "any",`
	`165`	`+ "type": "any",`
`166`	`166`	`"enum": [`
`167`		`- 6,`
`168`		`- "foo",`
`169`		`- [],`
`170`		`- true,`
	`167`	`+ 6,`
	`168`	`+ "foo",`
	`169`	`+ [],`
	`170`	`+ true,`
`171`	`171`	`{`
`172`	`172`	`"foo": 12`
`173`	`173`	`}`
`174`	`174`	`]`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`	`}'`
	`178`	`+ ],`
	`179`	`+ 'Numeric values with mathematical equality are considered valid' => [`
	`180`	`+ 'data' => '12',`
	`181`	`+ 'schema' => '{`
	`182`	`+ "type": "any",`
	`183`	`+ "enum": [`
	`184`	`+ 12.0`
	`185`	`+ ]`
	`186`	`+ }'`
`178`	`187`	`]`
`179`	`188`	`];`
`180`	`189`	`}`

Comments

(0)