optimize performance, smart lazy sort

benchmark/bechmark.php

@@ -0,0 +1,50 @@
+<?php
+
+use Blackfire\Client;
+use Blackfire\Profile\Configuration;
+use PTS\Events\Events;
+use PTS\Events\Filters;
+use PTS\Events\ResolveHandler;
+
+require_once __DIR__  .'/../vendor/autoload.php';
+
+$iterations = $argv[1] ?? 1000;
+$blackfire = $argv[2] ?? false;
+$iterations++;
+
+if ($blackfire) {
+    $client = new Client;
+    $probe = $client->createProbe(new Configuration);
+}
+
+$startTime = microtime(true);
+$resolver = new ResolveHandler;
+$events = new Events($resolver);
+$filters = new Filters($resolver);
+
+
+$events->on('event-a', function (int $a) {
+    return $a;
+}, 50, [1, 2])->on('event-a', function (int $b) {
+    return $b;
+});
+
+$filters->on('filter-a', function(int $a, int $b) {
+    return $a;
+}, 50, [1, 2])->on('filter-a', function (int $a, int $b) {
+    return $a;
+});
+
+
+while ($iterations--) {
+    $events->emit('event-a', [1]);
+    $filters->filter('filter-a', 1, [3]);
+}
+
+$diff = (microtime(true) - $startTime) * 1000;
+echo sprintf('%2.3f ms', $diff);
+echo "\n" . memory_get_peak_usage()/1024;
+
+if ($blackfire) {
+    $client->endProbe($probe);
+}

composer.json

@@ -21,7 +21,8 @@
         "php": ">=7.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5"
+        "phpunit/phpunit": "^7.5",
+        "blackfire/php-sdk": "^1.18"
     },
     "autoload": {
         "psr-4": {

src/BaseEvents.php

@@ -1,17 +1,20 @@
 <?php
+declare(strict_types=1);
 
 namespace PTS\Events;
 
 abstract class BaseEvents
 {
     /** @var array[][] */
     protected $listeners = [];
-    /** @var Handler */
+    /** @var ResolveHandler */
     protected $handler;
+    /** @var bool */
+    protected $sorted = false;
 
-    public function __construct()
+    public function __construct(ResolveHandler $handler = null)
     {
-        $this->handler = new Handler;
+        $this->handler = $handler ?? new ResolveHandler;
     }
 
     public function getListeners(): array
@@ -21,8 +24,10 @@ public function getListeners(): array
 
     protected function sortListeners(string $name): void
     {
-        if (array_key_exists($name, $this->listeners)) {
+        $isSorted = $this->sorted[$name] ?? false;
+        if (!$isSorted) {
             krsort($this->listeners[$name], SORT_NUMERIC);
+            $this->sorted[$name] = true;
         }
     }
 
@@ -43,6 +48,8 @@ public function on(string $name, callable $handler, int $priority = 50, array $e
             'priority' => $priority,
         ];
 
+        $this->sorted[$name] = false;
+
         return $this;
     }
 
@@ -70,8 +77,9 @@ public function once(string $name, callable $handler, int $priority = 50, array
      */
     protected function offAll(string $eventName): self
     {
-        if (array_key_exists($eventName, $this->listeners)) {
-            unset($this->listeners[$eventName]);
+        $hasEvent = $this->listeners[$eventName] ?? false;
+        if ($hasEvent) {
+            unset($this->listeners[$eventName], $this->sorted[$eventName]);
         }
 
         return $this;
@@ -95,7 +103,7 @@ public function off(string $eventName, callable $handler = null, int $priority =
             : $this->offHandlerWithPriority($eventName, $handler, $priority);
 
         if (empty($this->listeners[$eventName])) {
-            unset($this->listeners[$eventName]);
+            unset($this->listeners[$eventName], $this->sorted[$eventName]);
         }
 
         return $this;
@@ -114,7 +122,6 @@ protected function offHandlerWithPriority(string $eventName, callable $handler,
 
         if (isset($this->listeners[$eventName][$priority][$handlerId])) {
             unset($this->listeners[$eventName][$priority][$handlerId]);
-
             $this->cleanEmptyEvent($eventName, $priority);
         }
 
@@ -131,8 +138,8 @@ protected function offHandlerWithoutPriority(string $eventName, callable $handle
     {
         $handlerId = $this->handler->getKey($handler);
 
-        foreach ($this->listeners[$eventName] as $currentPriority => $nandlers) {
-            foreach ($nandlers as $currentHandlerId => $paramsHandler) {
+        foreach ($this->listeners[$eventName] as $currentPriority => $handlers) {
+            foreach ($handlers as $currentHandlerId => $paramsHandler) {
                 if ($handlerId === $currentHandlerId) {
                     unset($this->listeners[$eventName][$currentPriority][$handlerId]);
                     $this->cleanEmptyEvent($eventName, $currentPriority);
@@ -148,6 +155,10 @@ protected function cleanEmptyEvent(string $eventName, int $currentPriority): voi
         if (empty($this->listeners[$eventName][$currentPriority])) {
             unset($this->listeners[$eventName][$currentPriority]);
         }
+
+        if (empty($this->sorted[$eventName])) {
+            unset($this->sorted[$eventName]);
+        }
     }
 
     /**
@@ -159,7 +170,8 @@ protected function cleanEmptyEvent(string $eventName, int $currentPriority): voi
      */
     protected function trigger(string $name, array $arguments = [], $value = null)
     {
-        if (array_key_exists($name, $this->listeners)) {
+        $event = $this->listeners[$name] ?? false;
+        if ($event) {
             $this->sortListeners($name);
             foreach ($this->listeners[$name] as $handlers) {
                 foreach ($handlers as $paramsHandler) {
@@ -179,7 +191,7 @@ protected function trigger(string $name, array $arguments = [], $value = null)
      */
     protected function offOnce(array $paramsHandler, string $name): void
     {
-        if (array_key_exists('once', $paramsHandler) && $paramsHandler['once']) {
+        if ($paramsHandler['once'] ?? false) {
             $this->off($name, $paramsHandler['handler'], $paramsHandler['priority']);
         }
     }
@@ -193,8 +205,9 @@ protected function offOnce(array $paramsHandler, string $name): void
      */
     protected function getCallArgs(array $arguments, array $extraArguments, $value = null): array
     {
-        $arguments = array_merge($arguments, $extraArguments);
-        array_unshift($arguments, $value);
+        foreach ($extraArguments as $name => $val) {
+            $arguments[] = $val;
+        }
 
         return $arguments;
     }

src/EmitterTrait.php

@@ -24,6 +24,7 @@ public function setFilters(FiltersInterface $filters): void
      * @param string $name
      * @param mixed $value
      * @param mixed $arguments
+     *
      * @return mixed
      */
     public function filter(string $name, $value, array $arguments = [])

src/Events.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PTS\Events;
 
@@ -20,9 +21,4 @@ public function emit(string $name, array $arguments = [])
 
         return $this;
     }
-
-    protected function getCallArgs(array $arguments, array $extraArguments, $value = null): array
-    {
-        return array_merge($arguments, $extraArguments);
-    }
 }

src/EventsInterface.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PTS\Events;
 

src/Filters.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PTS\Events;
 
@@ -19,4 +20,12 @@ public function filter(string $name, $value, array $arguments = [])
             return $e->getValue();
         }
     }
+
+    protected function getCallArgs(array $arguments, array $extraArguments, $value = null): array
+    {
+        $arguments = parent::getCallArgs($arguments, $extraArguments, $value);
+        array_unshift($arguments, $value);
+
+        return $arguments;
+    }
 }

src/FiltersInterface.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PTS\Events;
 

src/Handler.php → src/ResolveHandler.php

@@ -1,14 +1,15 @@
 <?php
+declare(strict_types=1);
 
 namespace PTS\Events;
 
-class Handler
+class ResolveHandler
 {
 
     public function getKey(callable $handler): string
     {
         if (is_array($handler)) {
-            list($className, $method) = $handler;
+            [$className, $method] = $handler;
 
             if (is_object($className)) {
                 $className = get_class($className);

src/StopPropagation.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PTS\Events;
 

test/unit/FiltersTest.php

@@ -22,6 +22,7 @@ protected function setUp()
     /**
      * @param string $value
      * @param int $length
+     *
      * @return string
      */
     public function customFilterHandler(string $value, $length = 4): string