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

Unit tests with debug()

Browse Source 
SVN:trunk[5349]
This commit is contained in:
Eric Espié
2018-02-16 08:16:36 +00:00
parent b8fc24f093
commit 7ea9b5b2f3
1 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
setup/setuputils.class.inc.php
View File

@@ -400,7 +400,7 @@ class SetupUtils
{
ModuleDiscovery::GetAvailableModules($aDirsToScan, true, $aSelectedModules);
}
catch(MissingDependencyException $e)
catch(Exception $e)
{
$aResult[] = new CheckResult(CheckResult::ERROR, $e->getMessage());
}
@@ -589,13 +589,7 @@ class SetupUtils
throw new Exception("Attempting to delete directory: '$dir'");
}
self::tidydir($dir);
if (@rmdir($dir) === false)
{
// Magic trick for windows
// sometimes the folder is empty but rmdir fails
closedir(opendir($dir));
@rmdir($dir);
}
self::rmdir_safe($dir);
}
/**
@@ -620,13 +614,7 @@ class SetupUtils
if(is_dir($dir.'/'.$file))
{
self::tidydir($dir.'/'.$file);
if (@rmdir($dir.'/'.$file) === false)
{
// Magic trick for windows
// sometimes the folder is empty but rmdir fails
closedir(opendir($dir.'/'.$file));
@rmdir($dir.'/'.$file);
}
self::rmdir_safe($dir.'/'.$file);
}
else
{
@@ -661,6 +649,18 @@ class SetupUtils
}
}
public static function rmdir_safe($dir)
{
// avoid unnecessary warning
if (@rmdir($dir) === false)
{
// Magic trick for windows
// sometimes the folder is empty but rmdir fails
closedir(opendir($dir));
rmdir($dir);
}
}
/**
* Helper to copy a directory to a target directory, skipping .SVN files (for developer's comfort!)
* Returns true if successful
@@ -750,13 +750,14 @@ class SetupUtils
/**
* Helper to move a directory when the parent directory of the target dir cannot be written
* To be used as alternative to rename()
* To be used as alternative to rename()
* Files/Subdirs of the source directory are moved one by one
* Returns void
*
* @param string $sSource
* @param string $sDest
* @param boolean $bRemoveSource If true $sSource will be removed, otherwise $sSource will just be emptied
*
* @param string $sSource
* @param string $sDest
* @param boolean $bRemoveSource If true $sSource will be removed, otherwise $sSource will just be emptied
* @throws Exception
*/
public static function movedir($sSource, $sDest, $bRemoveSource = true)
{
@@ -777,7 +778,7 @@ class SetupUtils
self::tidydir($sSource);
if($bRemoveSource === true)
{
rmdir($sSource);
self::rmdir_safe($sSource);
}
/**
@@ -798,7 +799,7 @@ class SetupUtils
rename($sSource.'/'.$sFile, $sDest.'/'.$sFile);
}
}
rmdir($sSource);
self::rmdir_safe($sSource);
*/
}
@@ -1263,6 +1264,17 @@ EOF
return false;
}
/**
* @param string $sDBServer
* @param string $sDBUser
* @param string $sDBPwd
* @param string $sTlsKey
* @param string $sTlsCert
* @param string $sTlsCa
* @param string $sTlsCipher
* @return string
* @throws MySQLException
*/
static public function GetMySQLVersion(
$sDBServer, $sDBUser, $sDBPwd, $sTlsKey = null, $sTlsCert = null, $sTlsCa = null, $sTlsCipher = null
)
@@ -1646,7 +1658,13 @@ EOF
// echo "<pre>Comparison of ".dirname($sBaseDir)."/portal:\n".print_r($aResults, true)."</pre>";
return $aResults;
}
/**
* @param string $sInstalledVersion
* @param string $sSourceDir
* @return bool|hash
* @throws Exception
*/
public static function CheckVersion($sInstalledVersion, $sSourceDir)
{
$sManifestFilePath = self::GetVersionManifest($sInstalledVersion);