Skip to content

[Cache] Fix accepting named closures as early-expiration callbacks #62398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolas-grekas merged 1 commit into from
Nov 16, 2025
Merged

[Cache] Fix accepting named closures as early-expiration callbacks #62398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Symfony/Component/Cache/Messenger/EarlyExpirationMessage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ public static function create(ReverseContainer $reverseContainer, callable $call

$pool = $reverseContainer->getId($pool);

if ($callback instanceof \Closure && !str_contains(($r = new \ReflectionFunction($callback))->name, '{closure')) {
$callback = [$r->getClosureThis() ?? (\PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass())?->name, $r->name];
$callback[0] ?: $callback = $r->name;
}

if (\is_object($callback)) {
if (null === $id = $reverseContainer->getId($callback)) {
return null;
Expand Down
54 changes: 54 additions & 0 deletions src/Symfony/Component/Cache/Tests/Messenger/EarlyExpirationMessageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,58 @@ public function __invoke(CacheItem $item)
$this->assertSame('@computation_service', $msg->getCallback());
$this->assertSame($computationService, $msg->findCallback($reverseContainer));
}

public function testCreateWithNonAnonymousClosureBoundToInstance()
{
$pool = new ArrayAdapter();
$item = $pool->getItem('foo');
$item->set(234);

$computationService = new class {
public function compute(CacheItem $item)
{
return 123;
}

public static function staticCompute(CacheItem $item)
{
return 123;
}
};

$container = new Container();
$container->set('computation_service', $computationService);
$container->set('cache_pool', $pool);

$reverseContainer = new ReverseContainer($container, new ServiceLocator([]));

$closure = $computationService->compute(...);
$msg = EarlyExpirationMessage::create($reverseContainer, $closure, $item, $pool);
$this->assertSame(['@computation_service', 'compute'], $msg->getCallback());

$closure = $computationService::staticCompute(...);
$msg = EarlyExpirationMessage::create($reverseContainer, $closure, $item, $pool);
$this->assertSame([$computationService::class, 'staticCompute'], $msg->getCallback());

$msg = EarlyExpirationMessage::create($reverseContainer, var_dump(...), $item, $pool);
$this->assertSame('var_dump', $msg->getCallback());

$this->assertSame('cache_pool', $msg->getPool());
}

public function testCreateWithAnonymousClosure()
{
$pool = new ArrayAdapter();
$item = $pool->getItem('foo');
$item->set(234);

$container = new Container();
$container->set('cache_pool', $pool);

$reverseContainer = new ReverseContainer($container, new ServiceLocator([]));

$msg = EarlyExpirationMessage::create($reverseContainer, static fn () => 123, $item, $pool);

$this->assertNull($msg);
}
}