diff --git a/test/integration/iTopXmlVersionChecklistTest.php b/test/integration/iTopXmlVersionChecklistTest.php index ae9adc0a9..6a092c948 100644 --- a/test/integration/iTopXmlVersionChecklistTest.php +++ b/test/integration/iTopXmlVersionChecklistTest.php @@ -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})"); } } diff --git a/webservices/import.php b/webservices/import.php index 5009937f1..b88da870e 100644 --- a/webservices/import.php +++ b/webservices/import.php @@ -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);