diff options
author | Simon Rettberg | 2017-12-16 18:33:16 +0100 |
---|---|---|
committer | Simon Rettberg | 2017-12-16 18:33:16 +0100 |
commit | cd55ead3e2810e209b726faca12fa749f6875d0f (patch) | |
tree | 94b2f29b023e8a0c5100e1d06c974c3c04f890fd /modules-available/baseconfig/inc/baseconfigutil.inc.php | |
parent | Merge branch 'permission-manager' of openslx.org:openslx-ng/slx-admin into pe... (diff) | |
download | slx-admin-cd55ead3e2810e209b726faca12fa749f6875d0f.tar.gz slx-admin-cd55ead3e2810e209b726faca12fa749f6875d0f.tar.xz slx-admin-cd55ead3e2810e209b726faca12fa749f6875d0f.zip |
Fix A LOT of type problems, logic flaws, uninitialized variables etc.
Most of them were found by phpstorm, so I put in some time and
went through the list, fixing quite a bunch of them.
Diffstat (limited to 'modules-available/baseconfig/inc/baseconfigutil.inc.php')
-rw-r--r-- | modules-available/baseconfig/inc/baseconfigutil.inc.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/modules-available/baseconfig/inc/baseconfigutil.inc.php b/modules-available/baseconfig/inc/baseconfigutil.inc.php index 3039ea12..a48eb93b 100644 --- a/modules-available/baseconfig/inc/baseconfigutil.inc.php +++ b/modules-available/baseconfig/inc/baseconfigutil.inc.php @@ -37,12 +37,18 @@ class BaseConfigUtil return $settings; } + /** + * Get configuration categories for given module, or all modules if false is passed. + * + * @param \Module $module + * @return array + */ public static function getCategories($module = false) { $categories = array(); if ($module === false) { $module = '*'; - } else { + } elseif (is_object($module)) { $module = $module->getIdentifier(); } foreach (glob("modules/{$module}/baseconfig/categories.json", GLOB_NOSORT) as $file) { @@ -61,8 +67,8 @@ class BaseConfigUtil /** * Mark variables that would be shadowed according to the given values. * - * @param $vars list of vars as obtained from BaseConfigUtil::getVariables() - * @param $values key-value-pairs of variable assignments to work with + * @param array $vars list of vars as obtained from BaseConfigUtil::getVariables() + * @param array $values key-value-pairs of variable assignments to work with */ public static function markShadowedVars(&$vars, $values) { foreach ($vars as $key => &$var) { |