Merge pull request #19277 from SachinBahukhandi/twig-update-fix

MauricioFauth · web-flow · commit d4eaa170f3d2 · 2024-08-30T20:19:32.000-03:00
Fixed the issue appearing on updating twig
diff --git a/src/Error/Error.php b/src/Error/Error.php
@@ -396,7 +396,7 @@ public static function getArg(mixed $arg, string $function): string
             '_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
@@ -4,6 +4,7 @@
 
 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 @@
 
 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);

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace PhpMyAdmin\Twig\Node\Expression;`
`6`	`6`
	`7`	`+use Twig\Attribute\FirstClassTwigCallableReady;`
`7`	`8`	`use Twig\Compiler;`
`8`	`9`	`use Twig\Error\SyntaxError;`
`9`	`10`	`use Twig\Node\Expression\AbstractExpression;`
`@@ -18,6 +19,7 @@`
`18`	`19`
`19`	`20`	`final class TransExpression extends AbstractExpression`
`20`	`21`	`{`
	`22`	`+ #[FirstClassTwigCallableReady]`
`21`	`23`	`public function __construct(string $name, Node $arguments, int $lineno)`
`22`	`24`	`{`
`23`	`25`	`parent::__construct(['arguments' => $arguments], ['name' => $name, 'is_defined_test' => false], $lineno);`