From 0a61801d9aa7f64775b4f066f0aa75ec5a4f0fdd Mon Sep 17 00:00:00 2001
From: Faizan Akram <hello@faizanakram.me>
Date: Thu, 12 Dec 2024 14:42:49 +0100
Subject: [PATCH] adds support for invoking closures

---
 CHANGELOG                       | 1 +
 src/Extension/CoreExtension.php | 7 +++++++
 tests/TemplateTest.php          | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index b0520220415..f8e055b9a2a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
 
  * Fix the null coalescing operator when the test returns null
  * Fix the Elvis operator when used as '? :' instead of '?:'
+ * Support for invoking closures
 
 # 3.17.0 (2024-12-10)
 
diff --git a/src/Extension/CoreExtension.php b/src/Extension/CoreExtension.php
index b60944c4a4e..01e72856690 100644
--- a/src/Extension/CoreExtension.php
+++ b/src/Extension/CoreExtension.php
@@ -1740,6 +1740,10 @@ public static function getAttribute(Environment $env, Source $source, $object, $
 
             static $propertyCheckers = [];
 
+            if ($object instanceof \Closure && '__invoke' === $item) {
+                return $isDefinedTest ? true : $object();
+            }
+
             if (isset($object->$item)
                 || ($propertyCheckers[$object::class][$item] ??= self::getPropertyChecker($object::class, $item))($object, $item)
             ) {
@@ -1777,6 +1781,9 @@ public static function getAttribute(Environment $env, Source $source, $object, $
         // precedence: getXxx() > isXxx() > hasXxx()
         if (!isset($cache[$class])) {
             $methods = get_class_methods($object);
+            if ($object instanceof \Closure) {
+                $methods[] = '__invoke';
+            }
             sort($methods);
             $lcMethods = array_map('strtolower', $methods);
             $classCache = [];
diff --git a/tests/TemplateTest.php b/tests/TemplateTest.php
index 4d2489962f7..eb0e2db7d5a 100644
--- a/tests/TemplateTest.php
+++ b/tests/TemplateTest.php
@@ -394,6 +394,10 @@ public static function getGetAttributeTests()
             [true, ['foo' => 'bar'], $arrayAccess, 'vars', [], $anyType],
         ]);
 
+        // test for Closure::__invoke()
+        $tests[] = [true, 'closure called', fn (): string => 'closure called', '__invoke', [], $anyType];
+        $tests[] = [true, 'closure called', fn (): string => 'closure called', '__invoke', [], $methodType];
+
         // tests when input is not an array or object
         $tests = array_merge($tests, [
             [false, null, 42, 'a', [], $anyType, 'Impossible to access an attribute ("a") on a int variable ("42") in "index.twig".'],