From 5e1805d253f9b42e5cfeddd2d53db697d671f904 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Mon, 8 Jun 2020 09:42:45 +0200 Subject: [PATCH] Fix missing parent constructor call and get_class usage in GenericEventWrapper * The parent constructor was not called * `get_class` does not allow null values in php7.2+ Signed-off-by: Christoph Wurst --- lib/private/EventDispatcher/GenericEventWrapper.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/private/EventDispatcher/GenericEventWrapper.php b/lib/private/EventDispatcher/GenericEventWrapper.php index d1d136affc..dc3e7553f0 100644 --- a/lib/private/EventDispatcher/GenericEventWrapper.php +++ b/lib/private/EventDispatcher/GenericEventWrapper.php @@ -40,24 +40,26 @@ class GenericEventWrapper extends GenericEvent { private $eventName; public function __construct(ILogger $logger, string $eventName, ?GenericEvent $event) { + parent::__construct($eventName); $this->logger = $logger; $this->event = $event; $this->eventName = $eventName; } private function log() { + $class = ($this->event !== null && is_object($this->event)) ? get_class($this->event) : 'null'; $this->logger->info( 'Deprecated event type for {name}: {class} is used', - [ 'name' => $this->eventName, 'class' => is_object($this->event) ? get_class($this->event) : 'null' ] + [ 'name' => $this->eventName, 'class' => $class] ); } - public function isPropagationStopped() { + public function isPropagationStopped(): bool { $this->log(); return $this->event->isPropagationStopped(); } - public function stopPropagation() { + public function stopPropagation(): void { $this->log(); $this->event->stopPropagation(); }