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

N°4714 utils version method refactoring

Browse Source 
- removes utils::GetItopPatchVersion and GetItopMinorVersion : unused and badly named :/
- GetItopVersionWikiSyntax now uses core version constant
- iTopModulesPhpVersionIntegrationTest::testiTopModulesPhpVersion now uses ITOP_CORE_VERSION constant
This commit is contained in:
Pierre Goiffon
2022-02-01 15:03:06 +01:00
parent e14845728c
commit 17612f88d3
3 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
application/utils.inc.php
View File

@@ -2247,38 +2247,18 @@ class utils
/**
* @return string eg : '2_7_0' iTop core version is '2.7.1-dev'
* @throws \ApplicationException if constant value is invalid
* @uses ITOP_CORE_VERSION
*/
public static function GetItopVersionWikiSyntax()
{
$sMinorVersion = self::GetItopMinorVersion();
return str_replace('.', '_', $sMinorVersion).'_0';
}
$aExplodedVersion = explode('.', ITOP_CORE_VERSION);
/**
* @return string eg 2.7 if iTop core version is '2.7.0-dev'
* @throws \Exception
*/
public static function GetItopMinorVersion()
{
$sPatchVersion = self::GetItopPatchVersion();
$aExplodedVersion = explode('.', $sPatchVersion);
if (empty($aExplodedVersion[0]) || empty($aExplodedVersion[1]))
{
throw new Exception('iTop version is wrongfully configured!');
if (empty($aExplodedVersion[0]) || empty($aExplodedVersion[1])) {
throw new ApplicationException('iTop version is wrongfully configured!');
}
return sprintf('%d.%d', $aExplodedVersion[0], $aExplodedVersion[1]);
}
/**
* @return string eg '2.7.0' if iTop core version is '2.7.0-dev'
* @uses ITOP_CORE_VERSION
*/
public static function GetItopPatchVersion()
{
$aExplodedVersion = explode('-', ITOP_CORE_VERSION);
return $aExplodedVersion[0];
return "{$aExplodedVersion[0]}_{$aExplodedVersion[1]}_0";
}
/**