From 00d9a5fea78e44d9ec467e7e4ead5402e2e97266 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 11 Jul 2022 14:02:24 +0300 Subject: [PATCH] refactor(expressions): updates and small fixes --- src/flextype/core/Entries/Expressions/MathExpression.php | 4 ++-- src/flextype/core/Entries/Expressions/UrlExpression.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/flextype/core/Entries/Expressions/MathExpression.php b/src/flextype/core/Entries/Expressions/MathExpression.php index a169b772..e3033a67 100644 --- a/src/flextype/core/Entries/Expressions/MathExpression.php +++ b/src/flextype/core/Entries/Expressions/MathExpression.php @@ -26,8 +26,8 @@ class MathExpression implements ExpressionFunctionProviderInterface public function getFunctions() { return [ - new ExpressionFunction('ceil', static fn (int|float $num): float => '\ceil($num)', static fn (array $arguments, int|float $num): float => \ceil($num)), - new ExpressionFunction('floor', static fn (int|float $num): float => '\floor($num)', static fn (array $arguments, int|float $num): float => \floor($num)), + new ExpressionFunction('ceil', static fn (int|float $num): mixed => '\ceil($num)', static fn (array $arguments, int|float $num): mixed => \ceil($num)), + new ExpressionFunction('floor', static fn (int|float $num): mixed => '\floor($num)', static fn (array $arguments, int|float $num): mixed => \floor($num)), new ExpressionFunction('min', static fn (mixed ...$values): mixed => '\min($values)', static fn (array $arguments, mixed ...$values): mixed => \min($values)), new ExpressionFunction('max', static fn (mixed ...$values): mixed => '\max($values)', static fn (array $arguments, mixed ...$values): mixed => \max($values)), ]; diff --git a/src/flextype/core/Entries/Expressions/UrlExpression.php b/src/flextype/core/Entries/Expressions/UrlExpression.php index 78a72cae..652b988e 100644 --- a/src/flextype/core/Entries/Expressions/UrlExpression.php +++ b/src/flextype/core/Entries/Expressions/UrlExpression.php @@ -37,7 +37,7 @@ class UrlExpression implements ExpressionFunctionProviderInterface public function getFunctions() { return [ - new ExpressionFunction('url', static fn (string $string = '', string $prefix = 'base') => '\Flextype\url($string, $prefix)', static fn ($arguments, string $string = '', string $prefix = 'base') => urlFor($string, $prefix)), + new ExpressionFunction('url', static fn (string $string = '', string $prefix = 'base') => '\Flextype\url($string, $prefix)', static fn ($arguments, string $string = '', string $prefix = 'base') => url($string, $prefix)), new ExpressionFunction('urlFor', static fn (string $routeName, array $data = [], array $queryParams = []) => '\Flextype\urlFor($routeName, $data, $queryParams)', static fn ($arguments, string $routeName, array $data = [], array $queryParams = []) => urlFor($routeName, $data, $queryParams)), new ExpressionFunction('fullUrlFor', static fn (ServerRequestInterface $request, string $routeName, array $data = [], array $queryParams = []) => '\Flextype\fullUrlFor($request, $routeName, $data, $queryParams)', static fn ($arguments, ServerRequestInterface $request, string $routeName, array $data = [], array $queryParams = []) => fullUrlFor($request, $routeName, $data = [], $queryParams = [])), new ExpressionFunction('isCurrentUrl', static fn (ServerRequestInterface $request, string $routeName, array $data = []) => '\Flextype\isCurrentUrl($request, $routeName, $data)', static fn ($arguments, ServerRequestInterface $request, string $routeName, array $data = []) => isCurrentUrl($request, $routeName, $data = [])),