set target and params only if any

Author: marc-mabe

src/EventManager.php

@@ -132,8 +132,14 @@ public function trigger($eventName, $target = null, $argv = [])
     {
         $event = clone $this->eventPrototype;
         $event->setName($eventName);
-        $event->setTarget($target);
-        $event->setParams($argv);
+
+        if ($target !== null) {
+            $event->setTarget($target);
+        }
+
+        if ($argv) {
+            $event->setParams($argv);
+        }
 
         return $this->triggerListeners($event);
     }
@@ -145,8 +151,14 @@ public function triggerUntil(callable $callback, $eventName, $target = null, $ar
     {
         $event = clone $this->eventPrototype;
         $event->setName($eventName);
-        $event->setTarget($target);
-        $event->setParams($argv);
+
+        if ($target !== null) {
+            $event->setTarget($target);
+        }
+
+        if ($argv) {
+            $event->setParams($argv);
+        }
 
         return $this->triggerListeners($event, $callback);
     }
@@ -226,22 +238,21 @@ public function detach(callable $listener, $eventName = null, $force = false)
                     break;
                 }
             }
+        }
 
-            // If the queue for the given event is empty, remove it.
-            if (empty($this->events[$eventName])) {
-                unset($this->events[$eventName]);
-                break;
-            }
+        // If the queue for the given event is empty, remove it.
+        if (empty($this->events[$eventName])) {
+            unset($this->events[$eventName]);
         }
     }
 
     /**
      * @inheritDoc
      */
-    public function clearListeners($event)
+    public function clearListeners($eventName)
     {
-        if (isset($this->events[$event])) {
-            unset($this->events[$event]);
+        if (isset($this->events[$eventName])) {
+            unset($this->events[$eventName]);
         }
     }