composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

💚 Fix unit tests

Browse Source
This commit is contained in:
Eric
2019-10-16 11:36:01 +02:00
parent 65512ca984
commit fbc5280add
26 changed files with 964 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sources/application/status/status.inc.php
View File

@@ -2,6 +2,10 @@
namespace Combodo\iTop\Application\Status;
use Config;
use Exception;
use MetaModel;
define('STATUS_ERROR', 'ERROR');
define('STATUS_RUNNING', 'RUNNING');
@@ -22,9 +26,10 @@ function StatusGetAppRoot($sAppRootFilename = 'approot.inc.php')
*/
if (!file_exists($sAppRootFile) || !is_readable($sAppRootFile))
{
throw new \Exception($sAppRootFilename . ' is not readable');
throw new Exception($sAppRootFilename . ' is not readable');
}
require_once($sAppRootFile);
@require_once($sAppRootFile);
@require_once(APPROOT.'bootstrap.inc.php');
}
/**
@@ -46,7 +51,7 @@ function StatusCheckConfigFile($sConfigFilename = 'config-itop.php')
*/
if (!file_exists($sConfigFile) || !is_readable($sConfigFile))
{
throw new \Exception($sConfigFilename . ' is not readable');
throw new Exception($sConfigFilename . ' is not readable');
}
}
@@ -60,7 +65,7 @@ function StatusCheckConfigFile($sConfigFilename = 'config-itop.php')
* @throws \DictExceptionUnknownLanguage
* @throws \MySQLException
*/
function StatusStartup(\Config $oConfig = null)
function StatusStartup(Config $oConfig = null)
{
StatusCheckConfigFile();
@@ -71,5 +76,5 @@ function StatusStartup(\Config $oConfig = null)
$soConfigFile = (null === $oConfig) ? ITOP_DEFAULT_CONFIG_FILE : $oConfig;
//Check if application could be started
\MetaModel::Startup($soConfigFile, true /* $bModelOnly */);
MetaModel::Startup($soConfigFile, true /* $bModelOnly */);
}