Merge remote-tracking branch 'origin/support/2.7' into support/3.0

# Conflicts:
#	test/integration/iTopModulesPhpVersionChecklistTest.php
This commit is contained in:
Pierre Goiffon
2022-02-08 14:49:08 +01:00
2 changed files with 31 additions and 3 deletions

View File

@@ -2408,11 +2408,11 @@ class utils
* @throws \ApplicationException if constant value is invalid
* @uses ITOP_CORE_VERSION
*/
public static function GetCoreVersionWikiSyntax()
public static function GetCoreVersionWikiSyntax($sItopVersion = ITOP_CORE_VERSION)
{
$aExplodedVersion = explode('.', ITOP_CORE_VERSION);
$aExplodedVersion = explode('.', $sItopVersion);
if (empty($aExplodedVersion[0]) || empty($aExplodedVersion[1])) {
if ((false === isset($aExplodedVersion[0])) || (false === isset($aExplodedVersion[1]))) {
throw new ApplicationException('iTop version is wrongfully configured!');
}