tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hook: Don't abort loading remaining hooks due to one broken hook 

`Hook::all()` shouldn't abort loading the remaining hooks when one of
the provided hook is broken.
This commit is contained in:
Yonas Habteab 2023-08-07 14:12:32 +02:00 committed by Johannes Meyer
parent dec24686bc
commit ce012dcdb2
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/Icinga/Application/Hook.php
View File

@ -266,23 +266,21 @@ class Hook
* *
* @return array * @return array
*/ */
public static function all($name) public static function all($name): array
{ {
$name = self::normalizeHookName($name); $name = self::normalizeHookName($name);
if (! self::has($name)) { if (! self::has($name)) {
return array(); return [];
} }
foreach (self::$hooks[$name] as $key => $hook) { foreach (self::$hooks[$name] as $key => $hook) {
list($class, $alwaysRun) = $hook; list($class, $alwaysRun) = $hook;
if ($alwaysRun || self::hasPermission($class)) { if ($alwaysRun || self::hasPermission($class)) {
if (self::createInstance($name, $key) === null) { self::createInstance($name, $key);
return array();
}
} }
} }
return isset(self::$instances[$name]) ? self::$instances[$name] : array(); return self::$instances[$name] ?? [];
} }
/** /**