Commitf28f610

committed

[ExpressionLanguage] Addmin andmax php functions

1 parent0102e1e commitf28f610Copy full SHA for f28f610

File tree

+23

-5

lines changed

+23

-5

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,11 @@`
`1`	`1`	`CHANGELOG`
`2`	`2`	`=========`
`3`	`3`
	`4`	`+7.1`
	`5`	`+---`
	`6`	`+`
	`7`	+* Add support for php`min` and`max` functions
	`8`	`+`
`4`	`9`	`7.0`
`5`	`10`	`---`
`6`	`11`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,10 @@ public function registerProvider(ExpressionFunctionProviderInterface $provider):`
`140`	`140`	`*/`
`141`	`141`	`protectedfunctionregisterFunctions()`
`142`	`142`	`{`
`143`		`-$this->addFunction(ExpressionFunction::fromPhp('constant'));`
	`143`	`+$basicPhpFunctions = ['constant','min','max'];`
	`144`	`+foreach ($basicPhpFunctionsas$function) {`
	`145`	`+$this->addFunction(ExpressionFunction::fromPhp($function));`
	`146`	`+ }`
`144`	`147`
`145`	`148`	`$this->addFunction(newExpressionFunction('enum',`
`146`	`149`	`staticfn ($str):string =>sprintf("(\constant(\$v = (%s))) instanceof \UnitEnum ? \constant(\$v) : throw new \TypeError(\sprintf('The string\"%%s\" is not the name of a valid enum case.',\$v))",$str),`

Lines changed: 14 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,13 +71,23 @@ public function testCachedParse()`
`71`	`71`	`$this->assertSame($savedParsedExpression,$parsedExpression);`
`72`	`72`	`}`
`73`	`73`
`74`		`-publicfunctiontestConstantFunction()`
	`74`	`+/**`
	`75`	`+ * @dataProvider basicPhpFunctionProvider`
	`76`	`+ */`
	`77`	`+publicfunctiontestBasicPhpFunction($expression,$expected,$compiled)`
`75`	`78`	`{`
`76`	`79`	`$expressionLanguage =newExpressionLanguage();`
`77`		`-$this->assertEquals(\PHP_VERSION,$expressionLanguage->evaluate('constant("PHP_VERSION")'));`
	`80`	`+$this->assertEquals($expected,$expressionLanguage->evaluate($expression));`
	`81`	`+$this->assertEquals($compiled,$expressionLanguage->compile($expression));`
	`82`	`+ }`
`78`	`83`
`79`		`-$expressionLanguage =newExpressionLanguage();`
`80`		`-$this->assertEquals('\constant("PHP_VERSION")',$expressionLanguage->compile('constant("PHP_VERSION")'));`
	`84`	`+publicstaticfunctionbasicPhpFunctionProvider()`
	`85`	`+ {`
	`86`	`+return [`
	`87`	`+ ['constant("PHP_VERSION")', \PHP_VERSION,'\constant("PHP_VERSION")'],`
	`88`	`+ ['min(1,2,3)',1,'\min(1, 2, 3)'],`
	`89`	`+ ['max(1,2,3)',3,'\max(1, 2, 3)'],`
	`90`	`+ ];`
`81`	`91`	`}`
`82`	`92`
`83`	`93`	`publicfunctiontestEnumFunctionWithConstantThrows()`

Comments

(0)