Skip to content

make events register with a callabe, so the actual listeners are only… #1009

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

Open
jvangestel wants to merge 2 commits into
base: 2.x
Choose a base branch
from
Open

make events register with a callabe, so the actual listeners are only… #1009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cccef2
make events register with a callabe, so the actual listeners are only…
jvangestel Jul 3, 2026
aa30952
Update Psr11EventDispatcher for phpdoc fix
jvangestel Jul 20, 2026
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
44 changes: 43 additions & 1 deletion src/Event/Psr11EventDispatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,28 @@ public function __construct(protected ContainerInterface $container)
parent::__construct();
}

public function addLazySubscriber(string $subscriberClass): void
{
if (!is_a($subscriberClass, EventSubscriberInterface::class, true)) {
throw new \InvalidArgumentException(sprintf('%s is not a subscriber', $subscriberClass));
}

foreach ($subscriberClass::getSubscribedEvents() as $eventName => $params) {
if (\is_string($params)) {
$this->addListener($eventName, $this->getLazyListenerFromSubscriber($subscriberClass, $params));
} elseif (is_array($params) && !empty($params) && \is_string($params[0])) {
$this->addListener($eventName, $this->getLazyListenerFromSubscriber($subscriberClass, $params[0]), $params[1] ?? 0);
} else {
foreach ($params as $listener) {
if (!isset($listener[0])) {
$test = true;
}
$this->addListener($eventName, $this->getLazyListenerFromSubscriber($subscriberClass, $listener[0]), $listener[1] ?? 0);
}
}
}
}

/**
* If supplied listener name is a class, register that as Listener, instead of a callable from the subscriber
*
Expand Down Expand Up @@ -59,6 +81,26 @@ protected function callListeners(iterable $listeners, string $eventName, object
}
}

/**
* If supplied listener name is a class, register that as Listener, instead of a callable from the subscriber
*
* @param string $eventSubscriberClass
* @param string $listener
* @return callable
*/
protected function getLazyListenerFromSubscriber(string $eventSubscriberClass, string $listener): callable
{
if (class_exists($listener)) {
return $listener;
}

$container = $this->container;

return static function (...$args) use ($container, $eventSubscriberClass, $listener) {
return $container->get($eventSubscriberClass)->$listener(...$args);
};
}

/**
* If supplied listener name is a class, register that as Listener, instead of a callable from the subscriber
*
Expand All @@ -78,4 +120,4 @@ protected function getListenerFromSubscriber(EventSubscriberInterface $eventSubs

return [$eventSubscriber, $listener];
}
}
}
16 changes: 11 additions & 5 deletions src/Factory/EventDispatcherFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
if (isset($config['events'])) {
if (isset($config['events']['subscribers'])) {
foreach($config['events']['subscribers'] as $subscriberClass) {
if ($container->has($subscriberClass)) {
/*if ($container->has($subscriberClass)) {
$subscriber = $container->get($subscriberClass);
} else {
$subscriber = new $subscriberClass;
}
$event->addSubscriber($subscriber);
}*/
$event->addLazySubscriber($subscriberClass);
}
}
if (isset($config['events']['listeners'])) {
Expand All @@ -39,8 +39,14 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $

if (is_string($listenerCallable)) {
if (class_exists($listenerCallable)) {
$listenerClass = $container->get($listenerCallable);
$event->addListener($eventName, $listenerClass, $priority);
//$listenerClass = $container->get($listenerCallable);
$event->addListener(
$eventName,
static function (...$args) use ($container, $listenerCallable) {
return $container->get($listenerCallable)(...$args);
},
$priority
);
continue;
}
if (is_callable($listenerCallable)) {
Expand Down
Loading