mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Christoph Wurst 2020-06-08 09:42:45 +02:00
parent c5a2caa0fb
commit 5e1805d253
No known key found for this signature in database
GPG Key ID: CC42AC2A7F0E56D8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/EventDispatcher/GenericEventWrapper.php
View File

@ -40,24 +40,26 @@ class GenericEventWrapper extends GenericEvent {
private $eventName; private $eventName;
public function __construct(ILogger $logger, string $eventName, ?GenericEvent $event) { public function __construct(ILogger $logger, string $eventName, ?GenericEvent $event) {
parent::__construct($eventName);
$this->logger = $logger; $this->logger = $logger;
$this->event = $event; $this->event = $event;
$this->eventName = $eventName; $this->eventName = $eventName;
} }
private function log() { private function log() {
$class = ($this->event !== null && is_object($this->event)) ? get_class($this->event) : 'null';
$this->logger->info( $this->logger->info(
'Deprecated event type for {name}: {class} is used', '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(); $this->log();
return $this->event->isPropagationStopped(); return $this->event->isPropagationStopped();
} }
public function stopPropagation() { public function stopPropagation(): void {
$this->log(); $this->log();
$this->event->stopPropagation(); $this->event->stopPropagation();
} }