From 42f545d932843de32dc0cabb45ca2a66fcedc2f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@fusiondirectory.org>
Date: Thu, 28 Nov 2019 11:54:54 +0100
Subject: [PATCH] :ambulance: fix(core) Fill empty catch blocks with a comment
to please Sonar
issue #6054
---
plugins/admin/groups/class_ogroup.inc | 1 +
plugins/personal/roles/class_userRoles.inc | 2 ++
2 files changed, 3 insertions(+)
diff --git a/plugins/admin/groups/class_ogroup.inc b/plugins/admin/groups/class_ogroup.inc
index 51add0856..86e100fad 100644
--- a/plugins/admin/groups/class_ogroup.inc
+++ b/plugins/admin/groups/class_ogroup.inc
@@ -111,6 +111,7 @@ class GroupMembersAttribute extends ObjectsAttribute
$infos = objects::infos(ogroup::$objectTypes[$this->types[$key]]);
}
} catch (NonExistingObjectTypeException $e) {
+ /* Ignore non-existing types, plugins may have been removed */
}
if (isset($infos['icon'])) {
$img = $infos['icon'];
diff --git a/plugins/personal/roles/class_userRoles.inc b/plugins/personal/roles/class_userRoles.inc
index 1b39b4b6c..e4e95f9b2 100644
--- a/plugins/personal/roles/class_userRoles.inc
+++ b/plugins/personal/roles/class_userRoles.inc
@@ -183,6 +183,7 @@ class userRoles extends simplePlugin
$g->getBaseObject()->attributesAccess['member']->searchAndRemove($this->dn);
$g->save();
} catch (NonExistingLdapNodeException $e) {
+ /* Ignore deleted groups */
}
}
/* Remove all roles */
@@ -192,6 +193,7 @@ class userRoles extends simplePlugin
$r->getBaseObject()->attributesAccess['roleOccupant']->searchAndRemove($this->dn);
$r->save();
} catch (NonExistingLdapNodeException $e) {
+ /* Ignore deleted roles */
}
}
}
--
GitLab