From 6aaf1ea5d47dc8eedf2f7b852d7c246138d583cc Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Sat, 7 Jan 2023 20:49:29 +0100
Subject: [PATCH] Fix addons problem more elegant
---
src/Core/Addon.php | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 46ba0eec2b..8d1a866915 100644
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -51,7 +51,7 @@ class Addon
* @return array
* @throws \Exception
*/
- public static function getAvailableList()
+ public static function getAvailableList(): array
{
$addons = [];
$files = glob('addon/*/');
@@ -81,14 +81,10 @@ class Addon
* @return array
* @throws \Exception
*/
- public static function getAdminList()
+ public static function getAdminList(): array
{
$addons_admin = [];
- $addons = DI::config()->get('addons');
-
- if (empty($addons)) {
- return $addons_admin;
- }
+ $addons = DI::config()->get('addons') ?? [];
ksort($addons);
foreach ($addons as $name => $data) {
@@ -191,14 +187,12 @@ class Addon
* reload all updated addons
*
* @return void
+ * @throws \Exception
+ *
*/
public static function reload()
{
- $addons = DI::config()->get('addons');
-
- if (empty($addons)) {
- return;
- }
+ $addons = DI::config()->get('addons') ?? [];
foreach ($addons as $name => $data) {
$addonname = Strings::sanitizeFilePathItem(trim($name));
@@ -321,11 +315,7 @@ class Addon
public static function getVisibleList(): array
{
$visible_addons = [];
- $addons = DI::config()->get('addons');
-
- if (empty($addons)) {
- return $visible_addons;
- }
+ $addons = DI::config()->get('addons') ?? [];
foreach ($addons as $name => $data) {
$visible_addons[] = $name;