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

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

Browse Source 
# Conflicts:
#	core/config.class.inc.php
This commit is contained in:
Pierre Goiffon
2021-12-23 10:05:53 +01:00
parent d301562ffe 7b2bcd1055
commit 8bcd2ce571
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/iTopXmlVersionChecklistTest.php
View File

@@ -54,6 +54,6 @@ class iTopXmlVersionIntegrationTest extends ItopTestCase
$sCoreVersion = $aCoreVersionParts[0].'.'.$aCoreVersionParts[1];
$sXMLVersion = ITOP_DESIGN_LATEST_VERSION;
$this->assertSame($sXMLVersion, $sCoreVersion, "XML datamodel version ($sXMLVersion) is not aligned with the app. core version ($sCoreVersion)");
$this->assertSame($sXMLVersion, $sCoreVersion, "XML datamodel version (ITOP_DESIGN_LATEST_VERSION={$sXMLVersion}) is not aligned with the app. core version (ITOP_VERSION={$sCoreVersion})");
}
}

6
webservices/import.php
View File

@@ -225,7 +225,7 @@ catch(Exception $e)
{
$oP->p("Error: ".$e->GetMessage());
$oP->output();
exit -2;
exit(-2);
}
if (utils::IsModeCLI())
@@ -244,14 +244,14 @@ if (utils::IsModeCLI())
{
$oP->p("Access restricted or wrong credentials ('$sAuthUser')");
$oP->output();
exit -1;
exit(-1);
}
if (!is_readable($sCsvFile))
{
$oP->p("Input file could not be found or could not be read: '$sCsvFile'");
$oP->output();
exit -1;
exit(-1);
}
$sCSVData = file_get_contents($sCsvFile);