Update integration test and add module

composer.json

@@ -39,7 +39,7 @@
         "rector/rector": "^0.15.17",
         "psr/container": "^1.0",
         "psr/event-dispatcher": "^1.0",
-        "fig/event-dispatcher-util": "^1.0",
+        "fig/event-dispatcher-util": "^1.3",
         "crell/tukio": "^1.0",
         "inpsyde/object-hooks-remover": "^0.1",
         "italystrap/config": "^2.2",

src/Dispatcher.php

@@ -4,12 +4,16 @@
 
 namespace ItalyStrap\Event;
 
-use Psr\EventDispatcher\{ListenerProviderInterface, StoppableEventInterface};
+use Psr\EventDispatcher\{
+    EventDispatcherInterface,
+    ListenerProviderInterface,
+    StoppableEventInterface
+};
 
 /**
  * @psalm-api
  */
-class Dispatcher implements \Psr\EventDispatcher\EventDispatcherInterface
+class Dispatcher implements EventDispatcherInterface
 {
     private ListenerProviderInterface $listenerProvider;
     private StateInterface $state;

src/EventSubscription.php

@@ -17,7 +17,7 @@ class EventSubscription
      * @param int $acceptedArgs
      */
     public function __construct(
-        $callback,
+        callable $callback,
         int $priority = 10,
         int $acceptedArgs = 3
     ) {

src/GlobalOrderedListenerProvider.php

@@ -64,7 +64,7 @@ public function getListenersForEvent(object $event): iterable
         /**
          * \WP_Hook::callbacks is a multidimensional array
          * with priority as the first dimension and
-         * the callback as the second dimension.
+         * the callback name as the second dimension.
          * Example:
          * [
          *     10 => [ // $priority

src/ListenerRegistryTrait.php

@@ -6,6 +6,24 @@
 
 trait ListenerRegistryTrait
 {
+    /**
+     * Right now is only an experimental method, an idea to fetch $eventName
+     * from the listener first argument using reflection.
+     * I make this private for now to avoid to deprecated it in the future.
+     */
+    private function addListenerFromCallable(
+        callable $listener,
+        string $eventName = null,
+        int $priority = 10,
+        int $accepted_args = 3
+    ): bool {
+        if (null === $eventName) {
+            return false;
+        }
+
+        return add_filter($eventName, $listener, $priority, $accepted_args);
+    }
+
     public function addListener(
         string $eventName,
         callable $listener,

src/Module.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ItalyStrap\Event;
+
+use Psr\EventDispatcher\ListenerProviderInterface;
+
+/**
+ * @psalm-api
+ */
+class Module
+{
+    public function __invoke(): array
+    {
+        return [
+            'aliases' => [
+                // Global
+                EventDispatcherInterface::class => EventDispatcher::class,
+                SubscriberRegisterInterface::class => SubscriberRegister::class,
+                // PSR-14
+                \Psr\EventDispatcher\EventDispatcherInterface::class => Dispatcher::class,
+                ListenerProviderInterface::class => GlobalOrderedListenerProvider::class,
+                ListenerRegistryInterface::class => GlobalOrderedListenerProvider::class,
+                StateInterface::class => GlobalState::class,
+            ],
+            'sharing' => [
+                EventDispatcher::class,
+                SubscriberRegister::class,
+                // PSR-14
+                Dispatcher::class,
+                GlobalOrderedListenerProvider::class,
+                GlobalState::class,
+            ],
+        ];
+    }
+}

src/SubscribersConfigExtension.php

@@ -19,18 +19,18 @@ class SubscribersConfigExtension implements Extension
     /** @var string */
     public const SUBSCRIBERS = 'subscribers';
 
-    private \ItalyStrap\Event\SubscriberRegister $event_manager;
+    private \ItalyStrap\Event\SubscriberRegister $subscriberRegister;
 
     private \ItalyStrap\Config\ConfigInterface $config;
 
     /**
      * EventResolverExtension constructor.
-     * @param SubscriberRegister $event_manager
+     * @param SubscriberRegister $subscriberRegister
      * @param ConfigInterface $config
      */
-    public function __construct(SubscriberRegister $event_manager, ConfigInterface $config)
+    public function __construct(SubscriberRegister $subscriberRegister, ConfigInterface $config)
     {
-        $this->event_manager = $event_manager;
+        $this->subscriberRegister = $subscriberRegister;
         $this->config = $config;
     }
 
@@ -47,7 +47,7 @@ public function name(): string
      */
     public function execute(AurynConfigInterface $application): void
     {
-        $application->walk($this->name(), [$this, 'walk']);
+        $application->walk($this->name(), $this);
     }
 
     /**
@@ -57,7 +57,7 @@ public function execute(AurynConfigInterface $application): void
      * @throws ConfigException
      * @throws InjectionException
      */
-    public function walk(string $class, $index_or_optionName, Injector $injector): void
+    public function __invoke(string $class, $index_or_optionName, Injector $injector): void
     {
 
         if (\is_string($index_or_optionName) && empty($this->config->get($index_or_optionName, false))) {
@@ -66,6 +66,6 @@ public function walk(string $class, $index_or_optionName, Injector $injector): v
 
         /** @var SubscriberInterface $subscriber */
         $subscriber = $injector->share($class)->make($class);
-        $this->event_manager->addSubscriber($subscriber);
+        $this->subscriberRegister->addSubscriber($subscriber);
     }
 }