SetupUtils : add missing public access keyword for methods

This commit is contained in:
Pierre Goiffon
2020-06-12 16:50:04 +02:00
parent c768e18e2b
commit 1e6b885301

View File

@@ -119,7 +119,7 @@ class SetupUtils
* @internal SetupPage $oP The page used only for its 'log' method
* @return CheckResult[]
*/
static function CheckPhpAndExtensions()
public static function CheckPhpAndExtensions()
{
$aResult = array();
@@ -493,7 +493,7 @@ class SetupUtils
* @param $aSelectedModules
* @return array
*/
static function CheckSelectedModules($sSourceDir, $sExtensionDir, $aSelectedModules)
public static function CheckSelectedModules($sSourceDir, $sExtensionDir, $aSelectedModules)
{
$aResult = array();
SetupPage::log('Info - CheckSelectedModules');
@@ -524,7 +524,7 @@ class SetupUtils
* @return array An array of CheckResults objects
* @internal param Page $oP The page used only for its 'log' method
*/
static function CheckBackupPrerequisites($sDBBackupPath, $sMySQLBinDir = null)
public static function CheckBackupPrerequisites($sDBBackupPath, $sMySQLBinDir = null)
{
$aResult = array();
SetupPage::log('Info - CheckBackupPrerequisites');
@@ -614,7 +614,7 @@ class SetupUtils
* @return CheckResult The result of the check
* @internal param string $GraphvizPath The path where graphviz' dot program is installed
*/
static function CheckGraphviz($sGraphvizPath)
public static function CheckGraphviz($sGraphvizPath)
{
$oResult = null;
SetupPage::log('Info - CheckGraphviz');
@@ -663,7 +663,7 @@ class SetupUtils
* Emulates sys_get_temp_dir if needed (PHP < 5.2.1)
* @return string Path to the system's temp directory
*/
static function GetTmpDir()
public static function GetTmpDir()
{
return realpath(sys_get_temp_dir());
}
@@ -672,7 +672,7 @@ class SetupUtils
* Helper function to retrieve the directory where files are to be uploaded
* @return string Path to the temp directory used for uploading files
*/
static function GetUploadTmpDir()
public static function GetUploadTmpDir()
{
$sPath = ini_get('upload_tmp_dir');
if (empty($sPath))
@@ -895,7 +895,7 @@ class SetupUtils
}
}
static function GetPreviousInstance($sDir)
public static function GetPreviousInstance($sDir)
{
$sSourceDir = '';
$sSourceEnvironment = '';
@@ -949,7 +949,7 @@ class SetupUtils
* @return bool|float false if failure
* @uses \disk_free_space()
*/
static function CheckDiskSpace($sDir)
public static function CheckDiskSpace($sDir)
{
while(($f = @disk_free_space($sDir)) == false)
{
@@ -961,7 +961,7 @@ class SetupUtils
return $f;
}
static function HumanReadableSize($fBytes)
public static function HumanReadableSize($fBytes)
{
$aSizes = array('bytes', 'Kb', 'Mb', 'Gb', 'Tb', 'Pb', 'Hb');
$index = 0;
@@ -986,7 +986,7 @@ class SetupUtils
* @param string $sTlsCA
* @param string $sNewDBName
*/
static function DisplayDBParameters(
public static function DisplayDBParameters(
$oPage, $bIsItopInstall, $sDBServer, $sDBUser, $sDBPwd, $sDBName, $sDBPrefix, $bTlsEnabled, $sTlsCA,
$sNewDBName = ''
) {
@@ -1229,7 +1229,7 @@ EOF
* @return bool|array false if the connection failed or array('checks' => Array of CheckResult, 'databases' =>
* Array of database names (as strings) or null if not allowed)
*/
static function CheckDbServer(
public static function CheckDbServer(
$sDBServer, $sDBUser, $sDBPwd, $bTlsEnabled = false, $sTlsCA = null
)
{
@@ -2128,7 +2128,7 @@ JS
*/
class SetupInfo
{
static $aSelectedModules = array();
public static $aSelectedModules = array();
/**
* Called by the setup process to initializes the list of selected modules. Do not call this method
@@ -2136,7 +2136,7 @@ class SetupInfo
* @param hash $aModules
* @return void
*/
static function SetSelectedModules($aModules)
public static function SetSelectedModules($aModules)
{
self::$aSelectedModules = $aModules;
}
@@ -2147,7 +2147,7 @@ class SetupInfo
* @param string $sModuleId The identifier of the module (without the version number. Example: itop-config-mgmt)
* @return boolean True if the module is already selected, false otherwise
*/
static function ModuleIsSelected($sModuleId)
public static function ModuleIsSelected($sModuleId)
{
return (array_key_exists($sModuleId, self::$aSelectedModules));
}