Skip to content

Commit

Permalink
feature #4501 adds support for invoking closures (faizanakram99)
Browse files Browse the repository at this point in the history
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

adds support for invoking closures

- fixes #3848

Commits
-------

0a61801 adds support for invoking closures
  • Loading branch information
fabpot committed Dec 14, 2024
2 parents dc2949e + 0a61801 commit 918f52e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,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)

Expand Down
7 changes: 7 additions & 0 deletions src/Extension/CoreExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
) {
Expand Down Expand Up @@ -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 = [];
Expand Down
4 changes: 4 additions & 0 deletions tests/TemplateTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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".'],
Expand Down

0 comments on commit 918f52e

Please sign in to comment.