From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Mon, 8 Jun 2020 07:42:45 +0000 (+0200)
Subject: Fix missing parent constructor call and get_class usage in GenericEventWrapper
X-Git-Tag: v20.0.0beta1~445^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5e1805d253f9b42e5cfeddd2d53db697d671f904;p=nextcloud-server.git

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 <christoph@winzerhof-wurst.at>
---

diff --git a/lib/private/EventDispatcher/GenericEventWrapper.php b/lib/private/EventDispatcher/GenericEventWrapper.php
index d1d136affc0..dc3e7553f0c 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();
 	}