From 64434f8065d042db7757de122825132934c3b0ae Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 27 Sep 2019 17:14:04 +0200 Subject: [PATCH] :art: remove warnings --- setup/runtimeenv.class.inc.php | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/setup/runtimeenv.class.inc.php b/setup/runtimeenv.class.inc.php index 01a72db1c..376a18df8 100644 --- a/setup/runtimeenv.class.inc.php +++ b/setup/runtimeenv.class.inc.php @@ -135,37 +135,39 @@ class RunTimeEnvironment $this->oExtensionsMap = new iTopExtensionsMap($this->sTargetEnv); } } - + /** * Analyzes the current installation and the possibilities - * + * * @param Config $oConfig Defines the target environment (DB) * @param mixed $modulesPath Either a single string or an array of absolute paths - * @param bool $bAbortOnMissingDependency ... - * @param hash $aModulesToLoad List of modules to search for, defaults to all if ommitted - * @return hash Array with the following format: + * @param bool $bAbortOnMissingDependency ... + * @param array $aModulesToLoad List of modules to search for, defaults to all if ommitted + * + * @return array Array with the following format: * array => * 'iTop' => array( * 'version_db' => ... (could be empty in case of a fresh install) * 'version_code => ... * ) * => array( - * 'version_db' => ... - * 'version_code' => ... + * 'version_db' => ... + * 'version_code' => ... * 'install' => array( * 'flag' => SETUP_NEVER | SETUP_OPTIONAL | SETUP_MANDATORY - * 'message' => ... - * ) + * 'message' => ... + * ) * 'uninstall' => array( * 'flag' => SETUP_NEVER | SETUP_OPTIONAL | SETUP_MANDATORY - * 'message' => ... - * ) - * 'label' => ... - * 'dependencies' => array(, , ...) + * 'message' => ... + * ) + * 'label' => ... + * 'dependencies' => array(, , ...) * 'visible' => true | false * ) * ) - */ + * @throws \Exception + */ public function AnalyzeInstallation($oConfig, $modulesPath, $bAbortOnMissingDependency = false, $aModulesToLoad = null) { $aRes = array( @@ -342,7 +344,7 @@ class RunTimeEnvironment * Return an array with extra directories to scan for extensions/modules to install * @return string[] */ - protected function GetExtraDirsToScan() + protected function GetExtraDirsToScan($aDirs = array()) { // Do nothing, overload this method if needed return array();