Performance increasement by integer priority

Author: marc-mabe

src/EventManager.php

@@ -164,7 +164,7 @@ public function attach($eventName, callable $listener, $priority = 1)
             ));
         }
 
-        $this->events[$eventName][((int) $priority) . '.0'][] = $listener;
+        $this->events[$eventName][(int) $priority][] = $listener;
 
         return $listener;
     }
@@ -296,13 +296,19 @@ protected function triggerListeners(EventInterface $event, callable $callback =
      */
     private function getListenersByEventName($eventName)
     {
-        $listeners = array_merge_recursive(
-            isset($this->events[$eventName]) ? $this->events[$eventName] : [],
-            isset($this->events['*']) ? $this->events['*'] : [],
-            $this->sharedManager ? $this->sharedManager->getListeners($this->identifiers, $eventName) : []
-        );
+        $listeners = isset($this->events[$eventName]) ? $this->events[$eventName] : [];
+        if (isset($this->events['*'])) {
+            foreach ($this->events['*'] as $p => $l) {
+                $listeners[$p] = isset($listeners[$p]) ? array_merge($listeners[$p], $l) : $l;
+            }
+        }
+        if ($this->sharedManager) {
+            foreach ($this->sharedManager->getListeners($this->identifiers, $eventName) as $p => $l) {
+                $listeners[$p] = isset($listeners[$p]) ? array_merge($listeners[$p], $l) : $l;
+            }
+        }
 
-        krsort($listeners, SORT_NUMERIC);
+        krsort($listeners);
 
         $listenersForEvent = [];
 

src/SharedEventManager.php

@@ -74,7 +74,7 @@ public function attach($identifier, $event, callable $listener, $priority = 1)
             ));
         }
 
-        $this->identifiers[$identifier][$event][((int) $priority) . '.0'][] = $listener;
+        $this->identifiers[$identifier][$event][(int) $priority][] = $listener;
     }
 
     /**
@@ -178,22 +178,30 @@ public function getListeners(array $identifiers, $eventName)
             }
 
             $listenersByIdentifier = isset($this->identifiers[$identifier]) ? $this->identifiers[$identifier] : [];
-
-            $listeners = array_merge_recursive(
-                $listeners,
-                isset($listenersByIdentifier[$eventName]) ? $listenersByIdentifier[$eventName] : [],
-                isset($listenersByIdentifier['*']) ? $listenersByIdentifier['*'] : []
-            );
+            if (isset($listenersByIdentifier[$eventName])) {
+                foreach ($listenersByIdentifier[$eventName] as $p => $l) {
+                    $listeners[$p] = isset($listeners[$p]) ? array_merge($listeners[$p], $l) : $l;
+                }
+            }
+            if (isset($listenersByIdentifier['*'])) {
+                foreach ($listenersByIdentifier['*'] as $p => $l) {
+                    $listeners[$p] = isset($listeners[$p]) ? array_merge($listeners[$p], $l) : $l;
+                }
+            }
         }
 
-        if (isset($this->identifiers['*']) && ! in_array('*', $identifiers)) {
+        if (isset($this->identifiers['*']) && ! in_array('*', $identifiers, true)) {
             $wildcardIdentifier = $this->identifiers['*'];
-
-            $listeners = array_merge_recursive(
-                $listeners,
-                isset($wildcardIdentifier[$eventName]) ? $wildcardIdentifier[$eventName] : [],
-                isset($wildcardIdentifier['*']) ? $wildcardIdentifier['*'] : []
-            );
+            if (isset($wildcardIdentifier[$eventName])) {
+                foreach ($wildcardIdentifier[$eventName] as $p => $l) {
+                    $listeners[$p] = isset($listeners[$p]) ? array_merge($listeners[$p], $l) : $l;
+                }
+            }
+            if (isset($wildcardIdentifier['*'])) {
+                foreach ($wildcardIdentifier['*'] as $p => $l) {
+                    $listeners[$p] = isset($listeners[$p]) ? array_merge($listeners[$p], $l) : $l;
+                }
+            }
         }
 
         return $listeners;

test/SharedEventManagerTest.php

@@ -27,7 +27,7 @@ public function setUp()
 
     public function getListeners(SharedEventManager $manager, array $identifiers, $event, $priority = 1)
     {
-        $priority = (int) $priority . '.0';
+        $priority = (int) $priority;
         $listeners = $manager->getListeners($identifiers, $event);
         if (! isset($listeners[$priority])) {
             return [];
@@ -247,7 +247,7 @@ public function testClearListenersDoesNothingIfNoEventsRegisteredForIdentifier()
         $this->manager->clearListeners('IDENTIFIER', 'EVENT');
 
         // getListeners() always pulls in wildcard listeners
-        $this->assertEquals(['1.0' => [
+        $this->assertEquals([1 => [
             $this->callback,
         ]], $this->manager->getListeners([ 'IDENTIFIER' ], 'EVENT'));
     }