From da6847dd0d9a9be10ab0674d1867cc1aa8bc3363 Mon Sep 17 00:00:00 2001 From: Sachin Bahukhandi Date: Fri, 30 Aug 2024 15:21:26 +0530 Subject: [PATCH] Fixed the issue appearing on updating twig Signed-off-by: Sachin Bahukhandi --- src/Error/Error.php | 2 +- src/Twig/Node/Expression/TransExpression.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Error/Error.php b/src/Error/Error.php index 4e143dd64c..6cee9bb01c 100644 --- a/src/Error/Error.php +++ b/src/Error/Error.php @@ -396,7 +396,7 @@ class Error extends Message '_realConnect', ]; - if (in_array($function, $includeFunctions, true)) { + if (in_array($function, $includeFunctions, true) && is_string($arg)) { $retval .= self::relPath($arg); } elseif (in_array($function, $connectFunctions, true) && is_string($arg)) { $retval .= gettype($arg) . ' ********'; diff --git a/src/Twig/Node/Expression/TransExpression.php b/src/Twig/Node/Expression/TransExpression.php index bf14ca36db..1e1d2930ee 100644 --- a/src/Twig/Node/Expression/TransExpression.php +++ b/src/Twig/Node/Expression/TransExpression.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Twig\Node\Expression; +use Twig\Attribute\FirstClassTwigCallableReady; use Twig\Compiler; use Twig\Error\SyntaxError; use Twig\Node\Expression\AbstractExpression; @@ -18,6 +19,7 @@ use function trim; final class TransExpression extends AbstractExpression { + #[FirstClassTwigCallableReady] public function __construct(string $name, Node $arguments, int $lineno) { parent::__construct(['arguments' => $arguments], ['name' => $name, 'is_defined_test' => false], $lineno);