This repository was archived by the owner on Mar 29, 2024. It is now read-only.

Commit 474dd3b

committed

Add empty object string literal as default param value to builder

1 parent d029916 commit 474dd3bCopy full SHA for 474dd3b

File tree

+17

-2

lines changed

+17

-2

lines changed

Lines changed: 15 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,8 @@ class ParameterSpecBuilder implements ParameterSpecBuilderInterface`
`50`	`50`	`\|`
`51`	`51`	`(?:\[\s*\]) # empty array`
`52`	`52`	`\|`
	`53`	`+ (?:\{\s*\}) # empty object`
	`54`	`+ \|`
`53`	`55`	`true \| false \| null`
`54`	`56`	`)`
`55`	`57`	`)?`
`@@ -146,17 +148,28 @@ protected function buildDefaultValue(string $definition)`
`146`	`148`	`throw new ParameterSpecBuilderException("Unknown default value format '{$definition}'");`
`147`	`149`	`}`
`148`	`150`
`149`		`- if ('[' == $definition[0] && ']' == $definition[-1]) {`
	`151`	`+ if ($this->wrappedWith($definition, '[', ']')) {`
	`152`	`+ return [];`
	`153`	`+ }`
	`154`	`+`
	`155`	`+ if ($this->wrappedWith($definition, '{', '}')) {`
`150`	`156`	`return [];`
`151`	`157`	`}`
`152`	`158`
`153`	`159`	`foreach (['"', "'"] as $quote) {`
`154`		`- if ($quote == $definition[0] && $quote == $definition[-1]) {`
	`160`	`+ if ($this->wrappedWith($definition, $quote, $quote)) {`
`155`	`161`	`return trim($definition, $quote);`
`156`	`162`	`}`
`157`	`163`	`}`
`158`	`164`
`159`	`165`	`// Less likely we will ever get here because it should fail at a parsing step, but just in case`
`160`	`166`	`throw new ParameterSpecBuilderException("Unknown default value format '{$definition}'");`
`161`	`167`	`}`
	`168`	`+`
	`169`	`+ private function wrappedWith(string $definition, string $starts, $ends)`
	`170`	`+ {`
	`171`	`+ assert(strlen($definition) >= 2);`
	`172`	`+`
	`173`	`+ return $starts == $definition[0] && $ends == $definition[-1];`
	`174`	`+ }`
`162`	`175`	`}`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,8 @@ public function provideValidDefaultValues()`
`162`	`162`	`['1.2345', 1.2345],`
`163`	`163`	`['[]', []],`
`164`	`164`	`['[ ]', []],`
	`165`	`+ ['{}', []],`
	`166`	`+ ['{ }', []],`
`165`	`167`	`['null', null],`
`166`	`168`	`['Null', null],`
`167`	`169`	`['NulL', null],`

Comments

(0)