From a369415a1cae3acda3e679a013278d16701dbdb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@fusiondirectory.org>
Date: Mon, 7 Sep 2020 14:24:55 +0200
Subject: [PATCH] :ambulance: fix(setup) Fix errors spotted by phpstan
issue #6072
---
include/management/class_templateDialog.inc | 2 +-
plugins/admin/groups/class_groupManagement.inc | 2 +-
setup/class_setupStepMigrate.inc | 6 +-----
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/include/management/class_templateDialog.inc b/include/management/class_templateDialog.inc
index 44ec9bb85..06b153f2a 100644
--- a/include/management/class_templateDialog.inc
+++ b/include/management/class_templateDialog.inc
@@ -94,7 +94,7 @@ class templateDialog implements FusionDirectoryDialog
}
}
- public function update(): bool
+ public function update (): bool
{
return !$this->closed;
}
diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index b9865f750..48b228f21 100644
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -183,7 +183,7 @@ class groupManagement extends management
// Prepare event to be added
$events = argonautEventTypes::get_event_types();
if (isset($events[$event])) {
- $this->dialogObject = new argonautAction($event, $mac, !$triggered);
+ $this->dialogObject = new argonautAction($this, $event, $mac, !$triggered);
if ($triggered) {
$res = $o_queue->append($this->dialogObject);
diff --git a/setup/class_setupStepMigrate.inc b/setup/class_setupStepMigrate.inc
index 37ab1cc98..468684220 100644
--- a/setup/class_setupStepMigrate.inc
+++ b/setup/class_setupStepMigrate.inc
@@ -72,8 +72,6 @@ class StepMigrateDialog implements FusionDirectoryDialog
public function __construct (&$check, $tpl, $infos)
{
- $this->attribute = NULL;
- $this->dialog = NULL;
$this->infos = $infos;
$this->tplfile = $tpl;
$this->check = $check;
@@ -95,9 +93,7 @@ class StepMigrateDialog implements FusionDirectoryDialog
public function update (): bool
{
- if (!isset($this->check)) {
- return FALSE;
- }
+ return isset($this->check);
}
public function render (): string
--
GitLab