');
if ($sHtmlTitle != '')
{
- $oPage->add('');
}
$sBlockId = 'block_'.$this->sId.($bEditMode ? '_edit' : ''); // make a unique id (edition occuring in the same DOM)
$oBlock = new DisplayBlock($oFilter, $sType);
@@ -1868,11 +1868,11 @@ class DashletGroupByTable extends DashletGroupBy
$iTotal += $aDisplayData['value'];
}
- $oPage->add('
'.$sHtmlTitle.'
'); + $oPage->add(''.$sHtmlTitle.'
');
$sBlockId = 'block_fake_'.$this->sId.($bEditMode ? '_edit' : ''); // make a unique id (edition occuring in the same DOM)
$oPage->add('
');
+ $oPage->add('
');
$oPage->add('');
$oPage->add('');
@@ -1926,7 +1926,7 @@ class DashletHeaderStatic extends Dashlet
$oPage->add('
'.Dict::Format('UI:Pagination:HeaderNoSelection', $iTotal).'
'); $oPage->add('| $sProperty | $sCell | "; $sRes .= "
$sMessage
"); - ApplyNextAction($oP, $oObj, $sNextAction); + try + { + ApplyNextAction($oP, $oObj, $sNextAction); + } + catch (ApplicationException $e) + { + $sMessage = $e->getMessage(); + $sSeverity = 'info'; + ReloadAndDisplay($oP, $oObj, 'create', $sMessage, $sSeverity); + } } else { @@ -1384,7 +1493,7 @@ HTML } $iFieldsCount = count($aFieldsMap); $sJsonFieldsMap = json_encode($aFieldsMap); - + $oP->add_script( <<".Dict::S('UI:SystemIntrusion')."
\n"); @@ -1888,7 +2016,7 @@ catch(CoreException $e) catch(Exception $e) { require_once(APPROOT.'/setup/setuppage.class.inc.php'); - $oP = new SetupPage(Dict::S('UI:PageTitle:FatalError')); + $oP = new ErrorPage(Dict::S('UI:PageTitle:FatalError')); $oP->add("".Dict::S('UI:FatalErrorMessage')."
\n"); $oP->error(Dict::Format('UI:Error_Details', $e->getMessage())); $oP->output(); diff --git a/pages/ajax.render.php b/pages/ajax.render.php index 77b5e0dd2..25910adde 100644 --- a/pages/ajax.render.php +++ b/pages/ajax.render.php @@ -1020,7 +1020,18 @@ try { $bReleaseLock = iTopOwnershipLock::ReleaseLock($sObjClass, $iObjKey, $sToken); } - break; + + IssueLog::Trace('on_form_cancel', $sObjClass, array( + '$iObjKey' => $iObjKey, + '$sTransactionId' => $iTransactionId, + '$sTempId' => $sTempId, + '$sToken' => $sToken, + '$sUser' => UserRights::GetUser(), + 'HTTP_REFERER' => @$_SERVER['HTTP_REFERER'], + 'REQUEST_URI' => @$_SERVER['REQUEST_URI'], + )); + + break; case 'dashboard': $oPage->SetContentType('text/html'); @@ -1196,7 +1207,7 @@ EOF break; case 'dashboard_editor': - $sId = utils::ReadParam('id', '', false, 'element_identifier'); + $sId = utils::ReadParam('id', '', false, 'context_param'); $aExtraParams = utils::ReadParam('extra_params', array(), false, 'raw_data'); $aExtraParams['dashboard_div_id'] = utils::Sanitize($sId, '', 'element_identifier'); $sDashboardFile = utils::ReadParam('file', '', false, 'raw_data'); @@ -2649,6 +2660,17 @@ EOF $aResult['width'] = $aDimensions['width']; $aResult['height'] = $aDimensions['height']; } + + IssueLog::Trace('InlineImage created', 'InlineImage', array( + '$operation' => $operation, + '$aResult' => $aResult, + 'secret' => $oAttachment->Get('secret'), + 'temp_id' => $sTempId, + 'item_class' => $sObjClass, + 'user' => UserRights::GetUser(), + 'HTTP_REFERER' => @$_SERVER['HTTP_REFERER'], + 'REQUEST_URI' => @$_SERVER['REQUEST_URI'], + )); } else { @@ -2689,6 +2711,16 @@ EOF $oAttachment->Set('contents', $oDoc); $oAttachment->Set('secret', sprintf('%06x', mt_rand(0, 0xFFFFFF))); // something not easy to guess $iAttId = $oAttachment->DBInsert(); + + IssueLog::Trace('InlineImage created', 'InlineImage', array( + '$operation' => $operation, + 'secret' => $oAttachment->Get('secret'), + 'temp_id' => $sTempId, + 'item_class' => $sObjClass, + 'user' => UserRights::GetUser(), + 'HTTP_REFERER' => @$_SERVER['HTTP_REFERER'], + 'REQUEST_URI' => @$_SERVER['REQUEST_URI'], + )); } } catch (FileUploadException $e) diff --git a/pages/audit.php b/pages/audit.php index 306ba613f..7a055b479 100644 --- a/pages/audit.php +++ b/pages/audit.php @@ -282,6 +282,7 @@ try { try { + $iCount = 0; $oDefinitionFilter = DBObjectSearch::FromOQL($oAuditCategory->Get('definition_set')); $oDefinitionFilter->UpdateContextFromUser(); FilterByContext($oDefinitionFilter, $oAppContext); @@ -348,7 +349,7 @@ try $aRow['nb_errors'] = "n/a"; $aRow['percent_ok'] = ''; $aRow['class'] = 'red'; - $sMessage = Dict::Format('UI:Audit:ErrorIn_Category_Reason', $oAuditCategory->GetHyperlink(), $e->getMessage()); + $sMessage = Dict::Format('UI:Audit:ErrorIn_Category_Reason', $oAuditCategory->GetHyperlink(), utils::HtmlEntities($e->getMessage())); $oP->p("![](\"../images/stop-mid.png\"/)
".$sMessage);
$aResults[] = $aRow;
@@ -375,7 +376,7 @@ try
catch(CoreException $e)
{
require_once(APPROOT.'/setup/setuppage.class.inc.php');
- $oP = new SetupPage(Dict::S('UI:PageTitle:FatalError'));
+ $oP = new ErrorPage(Dict::S('UI:PageTitle:FatalError'));
$oP->add("".Dict::S('UI:FatalErrorMessage')."
\n"); $oP->error(Dict::Format('UI:Error_Details', $e->getHtmlDesc())); $oP->output(); @@ -404,7 +405,7 @@ catch(CoreException $e) catch(Exception $e) { require_once(APPROOT.'/setup/setuppage.class.inc.php'); - $oP = new SetupPage(Dict::S('UI:PageTitle:FatalError')); + $oP = new ErrorPage(Dict::S('UI:PageTitle:FatalError')); $oP->add("".Dict::S('UI:FatalErrorMessage')."
\n"); $oP->error(Dict::Format('UI:Error_Details', $e->getMessage())); $oP->output(); diff --git a/pages/csvimport.php b/pages/csvimport.php index cf618ce23..0cfcc4cd5 100644 --- a/pages/csvimport.php +++ b/pages/csvimport.php @@ -313,10 +313,9 @@ try // We're doing it for real, let's create a change $sUserString = CMDBChange::GetCurrentUserName().' (CSV)'; CMDBObject::SetTrackInfo($sUserString); - CMDBObject::SetTrackOrigin('csv-interactive'); - $oMyChange = CMDBObject::GetCurrentChange(); } + CMDBObject::SetTrackOrigin('csv-interactive'); $oBulk = new BulkChange( $sClassName, @@ -1491,7 +1490,7 @@ EOF catch(CoreException $e) { require_once(APPROOT.'/setup/setuppage.class.inc.php'); - $oP = new SetupPage(Dict::S('UI:PageTitle:FatalError')); + $oP = new ErrorPage(Dict::S('UI:PageTitle:FatalError')); $oP->add("".Dict::S('UI:FatalErrorMessage')."
\n"); $oP->error(Dict::Format('UI:Error_Details', $e->getHtmlDesc())); $oP->output(); @@ -1520,7 +1519,7 @@ catch(CoreException $e) catch(Exception $e) { require_once(APPROOT.'/setup/setuppage.class.inc.php'); - $oP = new SetupPage(Dict::S('UI:PageTitle:FatalError')); + $oP = new ErrorPage(Dict::S('UI:PageTitle:FatalError')); $oP->add("".Dict::S('UI:FatalErrorMessage')."
\n"); $oP->error(Dict::Format('UI:Error_Details', $e->getMessage())); $oP->output(); diff --git a/pages/graphviz.php b/pages/graphviz.php index ace9e1f9f..3ad2298d2 100644 --- a/pages/graphviz.php +++ b/pages/graphviz.php @@ -112,7 +112,7 @@ $sDotExecutable = MetaModel::GetConfig()->Get('graphviz_path'); if (file_exists($sDotExecutable)) { // create the file with Graphviz - $sImageFilePath = APPROOT."data/lifecycle/".$sClass.".png"; + $sImageFilePath = APPROOT."data/lifecycle/".$sClass.".svg"; if (!is_dir(APPROOT."data")) { @mkdir(APPROOT."data"); @@ -128,7 +128,7 @@ if (file_exists($sDotExecutable)) @fwrite($rFile, $sDotDescription); @fclose($rFile); $aOutput = array(); - $CommandLine = "\"$sDotExecutable\" -v -Tpng < \"$sDotFilePath\" -o \"$sImageFilePath\" 2>&1"; + $CommandLine = "\"$sDotExecutable\" -v -Tsvg < \"$sDotFilePath\" -o \"$sImageFilePath\" 2>&1"; exec($CommandLine, $aOutput, $iRetCode); if ($iRetCode != 0) @@ -142,15 +142,17 @@ if (file_exists($sDotExecutable)) } else { - header('Content-type: image/png'); - echo file_get_contents($sImageFilePath); + header('Content-type: image/svg+xml'); + header('Content-Disposition: inline; filename="'.$sClass.'.svg"'); + readfile($sImageFilePath); } @unlink($sDotFilePath); } else { header('Content-type: image/png'); - echo file_get_contents($sImageFilePath); + header('Content-Disposition: inline; filename="'.$sClass.'.png"'); + readfile($sImageFilePath); } ?> diff --git a/pages/navigator.php b/pages/navigator.php index a20e753fe..70b8d9d74 100755 --- a/pages/navigator.php +++ b/pages/navigator.php @@ -36,7 +36,7 @@ $oAppContext = new ApplicationContext(); $oP = new iTopWebPage("iTop - Navigator"); // Main program -$sClass = utils::ReadParam('class', ''); +$sClass = utils::ReadParam('class', '', false, 'class'); $id = utils::ReadParam('id', 0); $sRelation = utils::ReadParam('relation', 'neighbours'); diff --git a/pages/preferences.php b/pages/preferences.php index 5cdc3d4a1..3f093e47e 100644 --- a/pages/preferences.php +++ b/pages/preferences.php @@ -516,7 +516,7 @@ try catch(CoreException $e) { require_once(APPROOT.'/setup/setuppage.class.inc.php'); - $oP = new SetupPage(Dict::S('UI:PageTitle:FatalError')); + $oP = new ErrorPage(Dict::S('UI:PageTitle:FatalError')); $oP->add("".Dict::S('UI:FatalErrorMessage')."
\n"); $oP->error(Dict::Format('UI:Error_Details', $e->getHtmlDesc())); $oP->output(); @@ -545,7 +545,7 @@ catch(CoreException $e) catch(Exception $e) { require_once(APPROOT.'/setup/setuppage.class.inc.php'); - $oP = new SetupPage(Dict::S('UI:PageTitle:FatalError')); + $oP = new ErrorPage(Dict::S('UI:PageTitle:FatalError')); $oP->add("".Dict::S('UI:FatalErrorMessage')."
\n"); $oP->error(Dict::Format('UI:Error_Details', $e->getMessage())); $oP->output(); diff --git a/pages/schema.php b/pages/schema.php index 0254e86af..d608de8d9 100644 --- a/pages/schema.php +++ b/pages/schema.php @@ -247,32 +247,31 @@ function DisplayClassesList($oPage, $sContext) $oPage->add("- \n");
$oPage->add_ready_script(
- <<
- " ).append( val ).appendTo( ul );
+ };
+
$("#search-model").on('input', function() {
var search_result = [];
$("#ClassesList").find("li").each(function(){
@@ -293,11 +292,14 @@ function DisplayClassesList($oPage, $sContext)
$("#search-model").val("");
$("#search-model").trigger('input');
});
-EOF
+JS
);
// Get all the "root" classes for display
$aRootClasses = array();
+ $aClassLabelAndCodeAsJSON = [];
+ $aClassLabelAsJSON = array();
+ $aClassCodeAsJSON = array();
foreach (MetaModel::GetClasses() as $sClassName)
{
if (MetaModel::IsRootClass($sClassName))
@@ -312,20 +314,19 @@ EOF
//Fetch classes names for autocomplete purpose
// - Encode as JSON to escape quotes and other characters
- $sClassLabelAndCodeAsJSON = json_encode("$sLabelClassName ($sClassName)");
- $sClassLabelAsJSON = json_encode($sLabelClassName);
- $sClassCodeAsJSON = json_encode($sClassName);
- // - Push to autocomplete
- $oPage->add_script(
- <<
$sClassName,"label"=>"$sLabelClassName ($sClassName)"]); + array_push ($aClassLabelAsJSON, ["value"=>$sClassName,"label"=>"$sLabelClassName"]); + array_push ($aClassCodeAsJSON, ["value"=>$sClassName,"label"=>"$sClassName"]); } + usort($aClassLabelAndCodeAsJSON, "Label_sort"); + // - Push to autocomplete + $oPage->add_script("autocompleteClassLabelAndCode=".json_encode($aClassLabelAndCodeAsJSON)."; console.warn(autocompleteClassLabelAndCode);"); + $oPage->add_script("autocompleteClassLabel=".json_encode($aClassLabelAsJSON).";"); + $oPage->add_script("autocompleteClassCode=".json_encode($aClassCodeAsJSON).";"); + // Sort them alphabetically on their display name - asort($aRootClasses); + asort($aClassLabelAndCodeAsJSON); + //usort($aRootClasses,"Label_sort"); foreach ($aRootClasses as $sClassName => $sDisplayName) { if (MetaModel::IsRootClass($sClassName)) @@ -343,6 +344,9 @@ EOF $oPage->add_ready_script('$("#ClassesList").treeview();'); } +function Label_sort($building_a, $building_b) { + return strnatcmp ($building_a["label"], $building_b["label"]); +} /** * Helper for the list of classes related to the given class in a graphical way @@ -1055,19 +1059,28 @@ function DisplayGranularityDisplayer($oPage) $('.attrCode').show(); $('.attrLabel').show(); $('.parenthesis').show(); - $("#search-model").autocomplete(autocompleteClassLabelAndCode, {scroll:true, matchContains:true}); + $("#search-model").autocomplete({ + source: function (request, response) { + getListClass (request, response,autocompleteClassLabelAndCode); + }}); break; case 'label': $('.attrCode').hide(); $('.attrLabel').show(); $('.parenthesis').hide(); - $("#search-model").autocomplete(autocompleteClassLabel, {scroll:true, matchContains:true}); + $("#search-model").autocomplete({ + source: function (request, response) { + getListClass (request, response,autocompleteClassLabel); + }}); break; case 'code': $('.attrCode').show(); $('.attrLabel').hide(); $('.parenthesis').hide(); - $("#search-model").autocomplete(autocompleteClassCode, {scroll:true, matchContains:true}); + $("#search-model").autocomplete({ + source: function (request, response) { + getListClass (request, response,autocompleteClassCode); + }}); break; } SetUserPreference("datamodel_viewer_display_granularity", $('#displaySelector').val(), true); @@ -1144,13 +1157,28 @@ switch ($operation) if ($sClass != '') { $oPage->add_ready_script( - << li').show(); + e.parents().show(); +}); +//$('#search-model').trigger("input"); -EOF +JS ); DisplayClassDetails($oPage, $sClass, $sContext); + break; } default: diff --git a/pages/tagadmin.php b/pages/tagadmin.php index cecf2dcb0..afa0a5c1e 100644 --- a/pages/tagadmin.php +++ b/pages/tagadmin.php @@ -132,10 +132,10 @@ catch (Exception $e) { require_once(APPROOT.'setup/setuppage.class.inc.php'); - $oP = new SetupPage(Dict::S('UI:PageTitle:FatalError')); + $oP = new ErrorPage(Dict::S('UI:PageTitle:FatalError')); $oP->add(" ".Dict::S('UI:FatalErrorMessage')."
\n"); //$oP->error(Dict::Format('UI:Error_Details', $e->getMessage())); $oP->output(); IssueLog::Error($e->getMessage()); -} \ No newline at end of file +} diff --git a/portal/index.php b/portal/index.php index 7e2d048b1..1ef673a02 100644 --- a/portal/index.php +++ b/portal/index.php @@ -30,7 +30,7 @@ try catch(Exception $e) { require_once(APPROOT.'/setup/setuppage.class.inc.php'); - $oP = new SetupPage(Dict::S('UI:PageTitle:FatalError')); + $oP = new ErrorPage(Dict::S('UI:PageTitle:FatalError')); $oP->add("".Dict::S('UI:FatalErrorMessage')."
\n"); $oP->error(Dict::Format('UI:Error_Details', $e->getMessage())); $oP->output(); diff --git a/readme.txt b/readme.txt index 3cdfaed3c..b737c1bc7 100644 --- a/readme.txt +++ b/readme.txt @@ -4,6 +4,7 @@ iTop stands for *IT Operations Portal*. It is a complete open source, ITIL, web based service management tool including a fully customizable CMDB, a helpdesk system and a document management tool. iTop also offers mass import tools and web services to integrate with your IT + ## Features - Fully configurable **CMDB** - **HelpDesk** and Incident Management @@ -17,34 +18,21 @@ iTop also offers mass import tools and web services to integrate with your IT - **Data synchronization** (for data federation) -## Resources +## Latest release + - [Changes since the previous version](https://wiki.openitop.org/doku.php?id=latest:release:change_log) + - [New features](https://wiki.openitop.org/doku.php?id=latest:release:start) + - [Migration notes](https://wiki.openitop.org/doku.php?id=latest:install:start) + - [Download](https://sourceforge.net/projects/itop/files/latest/download) + +## Resources - [iTop Forums](https://sourceforge.net/p/itop/discussion/): for support request - [iTop Tickets](https://sourceforge.net/p/itop/tickets/): for feature requests and bug reports - [Releases download](https://sourceforge.net/projects/itop/files/itop/) + - [Software requirements](https://wiki.openitop.org/doku.php?id=latest:install:upgrading_itop) - [iTop documentation](https://www.itophub.io/wiki/page) for iTop and official extensions - [iTop extensions](https://store.itophub.io/en_US/) for discovering ans installing extensions -## Releases -### Version 2.7 - - [Changes since the previous version](https://wiki.openitop.org/doku.php?id=2_7_0:release:change_log) - - [New features](https://wiki.openitop.org/doku.php?id=2_7_0:release:2_7_whats_new) - - [Migration notes](https://wiki.openitop.org/doku.php?id=2_7_0:install:260_to_270_migration_notes) - -### Version 2.6 - - [Changes since the previous version](https://wiki.openitop.org/doku.php?id=2_6_0:release:change_log) - - [New features](https://wiki.openitop.org/doku.php?id=2_6_0:release:2_6_whats_new) - - [Migration notes](https://wiki.openitop.org/doku.php?id=2_6_0:install:250_to_260_migration_notes) -### Version 2.5 - - [Changes since the previous version](https://wiki.openitop.org/doku.php?id=2_5_0:release:change_log) - - [New features](https://wiki.openitop.org/doku.php?id=2_5_0:release:2_5_whats_new) - - [Migration notes](https://wiki.openitop.org/doku.php?id=2_5_0:install:240_to_250_migration_notes) - - -### Version 2.4 - - [Changes since the previous version](https://wiki.openitop.org/doku.php?id=2_4_0:release:change_log) - - [New features](https://wiki.openitop.org/doku.php?id=2_4_0:release:2_4_whats_new) - - [Migration notes](https://wiki.openitop.org/doku.php?id=2_4_0:install:230_to_240_migration_notes) diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php index 5552570d0..154bdb5cf 100644 --- a/setup/compiler.class.inc.php +++ b/setup/compiler.class.inc.php @@ -318,14 +318,27 @@ class MFCompiler } else { - /** @var \DOMElement $oClass */ + /** @var \MFElement $oClass */ foreach($oClasses as $oClass) { $sClass = $oClass->getAttribute("id"); $aAllClasses[] = $sClass; try { - $sCompiledCode .= $this->CompileClass($oClass, $sTempTargetDir, $sFinalTargetDir, $sRelativeDir); + $aCompiledClasses = $this->CompileClass($oClass, $sTempTargetDir, $sFinalTargetDir, $sRelativeDir); + + foreach ($aCompiledClasses['required_files'] as $sIncludeFile) + { + $sCompiledCode .= "require_once('$sIncludeFile');\n"; + } + + foreach ($aCompiledClasses['code'] as $sClass => $sCompiledClass) + { + $sClassFileName = DIRECTORY_SEPARATOR.$sRelativeDir.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'Model'.DIRECTORY_SEPARATOR.$sClass.'.php'; + $sClassFile = "{$sTempTargetDir}{$sClassFileName}"; + $this->WritePHPFile($sClassFile, $sModuleName, $sModuleVersion, $sCompiledClass); + $sCompiledCode .= "require_once ('{$sFinalTargetDir}{$sClassFileName}');\n"; + } } catch (DOMFormatException $e) { @@ -466,49 +479,7 @@ EOF; // Write the code into the given module as model..php // $sResultFile = $sTempTargetDir.'/'.$sRelativeDir.'/model.'.$sModuleName.'.php'; - if (is_file($sResultFile)) - { - $this->Log("Updating $sResultFile for module $sModuleName in version $sModuleVersion ($iClassCount classes)"); - } else - { - $sResultDir = dirname($sResultFile); - if (!is_dir($sResultDir)) - { - $this->Log("Creating directory $sResultDir"); - mkdir($sResultDir, 0777, true); - } - $this->Log("Creating $sResultFile for module $sModuleName in version $sModuleVersion ($iClassCount classes)"); - } - - // Compile the module into a single file - // - $sCurrDate = date(DATE_ISO8601); - $sAuthor = 'iTop compiler'; - $sLicence = 'http://opensource.org/licenses/AGPL-3.0'; - $sFileHeader = - << WritePHPFile($sResultFile, $sModuleName, $sModuleVersion, $sCompiledCode); } else { @@ -611,8 +582,8 @@ EOF; SetupUtils::builddir($sTempTargetDir.'/core'); $sPHPFile = $sTempTargetDir.'/core/main.php'; file_put_contents($sPHPFile, $this->sMainPHPCode); - + $sCurrDate = date(DATE_ISO8601); // Autoload $sPHPFile = $sTempTargetDir.'/autoload.php'; $sPHPFileContent = @@ -1018,7 +989,7 @@ EOF * @param string $sFinalTargetDir * @param string $sModuleRelativeDir * - * @return string + * @return array * @throws \DOMFormatException */ protected function CompileClass($oClass, $sTempTargetDir, $sFinalTargetDir, $sModuleRelativeDir) @@ -1997,7 +1968,7 @@ EOF $sClassName = $oClass->getAttribute('id'); $bIsAbstractClass = ($oProperties->GetChildText('abstract') == 'true'); $oPhpParent = $oClass->GetUniqueElement('php_parent', false); - $aRequiredFiles = array(); + $aRequiredFiles = []; if ($oPhpParent) { $sParentClass = $oPhpParent->GetChildText('name', ''); @@ -2030,8 +2001,7 @@ $sZlists; EOF; // some other stuff (magical attributes like friendlyName) are done in MetaModel::InitClasses and though not present in the // generated PHP - $sPHP = $this->GeneratePhpCodeForClass($sClassName, $sParentClass, $sClassParams, $sInitMethodCalls, - $bIsAbstractClass, $sMethods, $aRequiredFiles, $sCodeComment); + $aPHP[$sClassName] = $this->GeneratePhpCodeForClass($sClassName, $sParentClass, $sClassParams, $sInitMethodCalls, $bIsAbstractClass, $sMethods, $sCodeComment); // N°931 generates TagFieldData classes for AttributeTag fields if (!empty($aTagFieldsInfo)) @@ -2060,11 +2030,11 @@ EOF { $sTagClassName = static::GetTagDataClassName($sClassName, $sTagFieldName); $sTagClassParams = var_export($aTagClassParams, true); - $sPHP .= $this->GeneratePhpCodeForClass($sTagClassName, $sTagClassParentClass, $sTagClassParams, $sTagInitMethodCalls); + $aPHP[$sTagClassName] = $this->GeneratePhpCodeForClass($sTagClassName, $sTagClassParentClass, $sTagClassParams, $sTagInitMethodCalls); } } - return $sPHP; + return ['code' => $aPHP, 'required_files' => $aRequiredFiles]; } private static function GetTagDataClassName($sClass, $sAttCode) @@ -3008,22 +2978,21 @@ EOF; * @param bool $bIsAbstractClass * @param string $sMethods * - * @param array $aRequiredFiles * @param string $sCodeComment * * @return string php code for the class */ private function GeneratePhpCodeForClass( - $sClassName, $sParentClassName, $sClassParams, $sInitMethodCalls = '', $bIsAbstractClass = false, $sMethods = '', - $aRequiredFiles = array(), $sCodeComment = '' + $sClassName, + $sParentClassName, + $sClassParams, + $sInitMethodCalls = '', + $bIsAbstractClass = false, + $sMethods = '', + $sCodeComment = '' ) { $sPHP = "\n\n$sCodeComment\n"; - foreach ($aRequiredFiles as $sIncludeFile) - { - $sPHP .= "\nrequire_once('$sIncludeFile');\n"; - } - if ($bIsAbstractClass) { $sPHP .= 'abstract class '.$sClassName; @@ -3126,7 +3095,7 @@ EOF; */ protected function WriteStaticOnlyWebConfig($sTempTargetDir) { - $sContent = << @@ -3159,8 +3128,57 @@ EOF; WriteFile($sResultFile, $sFileHeader.$sCompiledCode); + } } diff --git a/setup/extensionsmap.class.inc.php b/setup/extensionsmap.class.inc.php index 4401175e6..53ef0392b 100644 --- a/setup/extensionsmap.class.inc.php +++ b/setup/extensionsmap.class.inc.php @@ -277,7 +277,6 @@ class iTopExtensionsMap $oExtension->sVersion = $oXml->Get('version'); $oExtension->bMandatory = ($oXml->Get('mandatory') == 'true'); $oExtension->sMoreInfoUrl = $oXml->Get('more_info_url'); - $oExtension->sVersion = $oXml->Get('version'); $oExtension->sSource = $sSource; $oExtension->sSourceDir = $sSearchDir; diff --git a/setup/modelfactory.class.inc.php b/setup/modelfactory.class.inc.php index 14880065d..2bc507c99 100644 --- a/setup/modelfactory.class.inc.php +++ b/setup/modelfactory.class.inc.php @@ -256,18 +256,21 @@ class MFModule public function GetDictionaryFiles() { $aDictionaries = array(); - if ($hDir = opendir($this->sRootDir)) + foreach (array($this->sRootDir, $this->sRootDir.'/dictionaries') as $sRootDir) { - while (($sFile = readdir($hDir)) !== false) + if ($hDir = @opendir($sRootDir)) { - $aMatches = array(); - if (preg_match("/^[^\\.]+.dict.".$this->sName.'.php$/i', $sFile, - $aMatches)) // Dictionary files are named like .dict. .php + while (($sFile = readdir($hDir)) !== false) { - $aDictionaries[] = $this->sRootDir.'/'.$sFile; + $aMatches = array(); + if (preg_match("/^[^\\.]+.dict.".$this->sName.'.php$/i', $sFile, + $aMatches)) // Dictionary files are named like .dict. .php + { + $aDictionaries[] = $sRootDir.'/'.$sFile; + } } + closedir($hDir); } - closedir($hDir); } return $aDictionaries; @@ -466,18 +469,21 @@ class MFDictModule extends MFModule public function GetDictionaryFiles() { $aDictionaries = array(); - if ($hDir = opendir($this->sRootDir)) + foreach (array($this->sRootDir, $this->sRootDir.'/dictionaries') as $sRootDir) { - while (($sFile = readdir($hDir)) !== false) + if ($hDir = @opendir($sRootDir)) { - $aMatches = array(); - if (preg_match("/^.*dictionary\\.itop.*.php$/i", $sFile, - $aMatches)) // Dictionary files are named like .dict. .php + while (($sFile = readdir($hDir)) !== false) { - $aDictionaries[] = $this->sRootDir.'/'.$sFile; + $aMatches = array(); + if (preg_match("/^.*dictionary\\.itop.*.php$/i", $sFile, + $aMatches)) // Dictionary files are named like .dict. .php + { + $aDictionaries[] = $sRootDir.'/'.$sFile; + } } + closedir($hDir); } - closedir($hDir); } return $aDictionaries; @@ -2898,4 +2904,4 @@ class MFParameters return $merged; } -} \ No newline at end of file +} diff --git a/setup/modulediscovery.class.inc.php b/setup/modulediscovery.class.inc.php index a77db0ecd..07d78c618 100644 --- a/setup/modulediscovery.class.inc.php +++ b/setup/modulediscovery.class.inc.php @@ -134,17 +134,20 @@ class ModuleDiscovery { $sModuleName = $aMatches[1]; $sDir = dirname($sFilePath); - if ($hDir = opendir($sDir)) + foreach (array($sDir, $sDir.'/dictionaries') as $sRootDir) { - while (($sFile = readdir($hDir)) !== false) + if ($hDir = @opendir($sRootDir)) { - $aMatches = array(); - if (preg_match("/^[^\\.]+.dict.$sModuleName.php$/i", $sFile, $aMatches)) // Dictionary files named like .dict. .php are loaded automatically + while (($sFile = readdir($hDir)) !== false) { - self::$m_aModules[$sId]['dictionary'][] = self::$m_sModulePath.'/'.$sFile; + $aMatches = array(); + if (preg_match("/^[^\\.]+.dict.$sModuleName.php$/i", $sFile, $aMatches)) // Dictionary files named like .dict. .php are loaded automatically + { + self::$m_aModules[$sId]['dictionary'][] = $sRootDir.'/'.$sFile; + } } + closedir($hDir); } - closedir($hDir); } } } diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php index 70911820c..30b95c1bb 100644 --- a/setup/setuputils.class.inc.php +++ b/setup/setuputils.class.inc.php @@ -39,6 +39,50 @@ class CheckResult $this->sLabel = $sLabel; $this->sDescription = $sDescription; } + + /** + * @return string + * @since 2.8.0 N°2214 + */ + public function __toString() + { + $sPrintDesc = (empty($this->sDescription)) ? '' : " ({$this->sDescription})"; + return "{$this->sLabel}$sPrintDesc"; + } + + /** + * @param \CheckResult[] $aResults + * + * @return \CheckResult[] only elements that are error (iSeverity===ERROR) + * + * @since 2.8.0 N°2214 + */ + public static function KeepOnlyErrors($aResults) + { + return array_filter($aResults, + static function ($v) + { + if ($v->iSeverity === CheckResult::ERROR) { + return $v; + } + }, + ARRAY_FILTER_USE_BOTH); + } + + /** + * @param \CheckResult[] $aResults + * + * @return string[] + * @uses \CheckResult::__toString + * + * @since 2.8.0 N°2214 + */ + public static function FromObjectsToStrings($aResults) + { + return array_map(function ($value) { + return $value->__toString(); + }, $aResults); + } } /** @@ -50,15 +94,15 @@ class CheckResult class SetupUtils { // -- Minimum versions (requirements : forbids installation if not met) - const PHP_MIN_VERSION = '5.6.0'; // 5.6 will be supported until the end of 2018 (see http://php.net/supported-versions.php) + const PHP_MIN_VERSION = '7.1.3'; // 7 will be supported until the end of 2019 (see http://php.net/supported-versions.php) const MYSQL_MIN_VERSION = '5.6.0'; // 5.6 to have fulltext on InnoDB for Tags fields (N°931) const MYSQL_NOT_VALIDATED_VERSION = ''; // MySQL 8 is now OK (N°2010 in 2.7.0) but has no query cache so mind the perf on large volumes ! // -- versions that will be the minimum in next iTop major release (warning if not met) - const PHP_NEXT_MIN_VERSION = '7.1.3'; // we are aiming on switching to Symfony 4 in iTop 2.8 + const PHP_NEXT_MIN_VERSION = ''; // const MYSQL_NEXT_MIN_VERSION = ''; // no new MySQL requirement for next iTop version // -- First recent version that is not yet validated by Combodo (warning) - const PHP_NOT_VALIDATED_VERSION = '7.5.0'; + const PHP_NOT_VALIDATED_VERSION = '8.0.0'; const MIN_MEMORY_LIMIT = 33554432; // 32 * 1024 * 1024 - we can use expressions in const since PHP 5.6 but we are in the setup ! const SUHOSIN_GET_MAX_VALUE_LENGTH = 2048; @@ -76,7 +120,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(); @@ -370,6 +414,37 @@ class SetupUtils return $aResult; } + /** + * @param \CLIPage $oCliPage + * @param int $iExitCode + * + * @since 2.8.0 N°2214 + */ + public static function CheckPhpAndExtensionsForCli($oCliPage, $iExitCode = -1) + { + $aPhpCheckResults = self::CheckPhpAndExtensions(); + $aPhpCheckErrors = CheckResult::KeepOnlyErrors($aPhpCheckResults); + if (empty($aPhpCheckErrors)) + { + return; + } + + $sMessageTitle = 'Error: PHP minimum requirements are not met !'; + $oCliPage->p($sMessageTitle); + $aPhpCheckErrorsForPrint = CheckResult::FromObjectsToStrings($aPhpCheckErrors); + foreach ($aPhpCheckErrorsForPrint as $sError) + { + $oCliPage->p(' * '.$sError); + } + $oCliPage->output(); + + // some CLI scripts are launched automatically + // we need a log so that we don't miss errors after migration ! + IssueLog::Error($oCliPage->s_title.' '.$sMessageTitle, 'CLI', $aPhpCheckErrorsForPrint); + + exit($iExitCode); + } + /** * @param CheckResult[] $aResult checks log */ @@ -419,7 +494,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'); @@ -450,7 +525,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'); @@ -540,7 +615,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'); @@ -589,7 +664,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()); } @@ -598,7 +673,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)) @@ -821,7 +896,7 @@ class SetupUtils } } - static function GetPreviousInstance($sDir) + public static function GetPreviousInstance($sDir) { $sSourceDir = ''; $sSourceEnvironment = ''; @@ -875,7 +950,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) { @@ -887,7 +962,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; @@ -912,7 +987,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 = '' ) { @@ -1155,7 +1230,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 ) { @@ -1606,29 +1681,16 @@ JS } $sManualInstallModulesFullPath = APPROOT.$sExtensionsDir.DIRECTORY_SEPARATOR; - $aManualInstallModules = array_filter($aModules, - static function ($v, $k) use ($sManualInstallModulesFullPath) { - if (!isset($v['root_dir'])) // avoid index undefined for the _Root_ entry - { - return false; - } - // calling realpath to avoid problems with dir separator (almost everywhere we are adding '/' instead of DIRECTORY_SEPARATOR) - $return = utils::RealPath($v['root_dir'], $sManualInstallModulesFullPath); - if ($return === false) - { - return false; - } - - return true; - }, - ARRAY_FILTER_USE_BOTH); - - if (empty($aManualInstallModules)) + //simple test in order to prevent install iTop pro with module in extension folder + $aFileInfo = scandir($sManualInstallModulesFullPath); + foreach ($aFileInfo as $sFolder) { - return ''; + if ($sFolder != "." && $sFolder != ".." && is_dir($sManualInstallModulesFullPath.$sFolder) === true) + { + return "Some modules are present in the '$sExtensionsDir' directory, this is not allowed when using ".ITOP_APPLICATION; + } } - - return "Some modules are present in the '$sExtensionsDir' directory, this is not allowed when using ".ITOP_APPLICATION; + return ''; } /** @@ -2067,7 +2129,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 @@ -2075,7 +2137,7 @@ class SetupInfo * @param hash $aModules * @return void */ - static function SetSelectedModules($aModules) + public static function SetSelectedModules($aModules) { self::$aSelectedModules = $aModules; } @@ -2086,7 +2148,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)); } diff --git a/sources/application/TwigBase/Controller/Controller.php b/sources/application/TwigBase/Controller/Controller.php index 64907aadb..7ff7eb49d 100644 --- a/sources/application/TwigBase/Controller/Controller.php +++ b/sources/application/TwigBase/Controller/Controller.php @@ -23,6 +23,7 @@ use ajax_page; use ApplicationMenu; use Combodo\iTop\Application\TwigBase\Twig\TwigHelper; use Dict; +use ErrorPage; use Exception; use IssueLog; use iTopWebPage; @@ -160,7 +161,7 @@ abstract class Controller require_once(APPROOT."/setup/setuppage.class.inc.php"); http_response_code(500); - $oP = new SetupPage(Dict::S('UI:PageTitle:FatalError')); + $oP = new ErrorPage(Dict::S('UI:PageTitle:FatalError')); $oP->add(" ".Dict::S('UI:FatalErrorMessage')."
\n"); $oP->add(get_class($e).' : '.htmlentities($e->GetMessage(), ENT_QUOTES, 'utf-8')); $oP->output(); diff --git a/sources/application/TwigBase/Twig/TwigHelper.php b/sources/application/TwigBase/Twig/TwigHelper.php index ad1bcfb39..98f1560aa 100644 --- a/sources/application/TwigBase/Twig/TwigHelper.php +++ b/sources/application/TwigBase/Twig/TwigHelper.php @@ -22,6 +22,14 @@ class TwigHelper $oLoader = new Twig_Loader_Filesystem($sViewPath); $oTwig = new Twig_Environment($oLoader); Extension::RegisterTwigExtensions($oTwig); + if (!utils::IsDevelopmentEnvironment()) + { + // Disable the cache in development environment + $sLocalPath = utils::LocalPath($sViewPath); + $sLocalPath = str_replace('env-'.utils::GetCurrentEnvironment(), 'twig', $sLocalPath); + $sCachePath = utils::GetCachePath().$sLocalPath; + $oTwig->setCache($sCachePath); + } return $oTwig; } diff --git a/sources/application/search/criterionconversion/criteriontooql.class.inc.php b/sources/application/search/criterionconversion/criteriontooql.class.inc.php index cc90ae6f8..cf3e84c8c 100644 --- a/sources/application/search/criterionconversion/criteriontooql.class.inc.php +++ b/sources/application/search/criterionconversion/criteriontooql.class.inc.php @@ -123,7 +123,6 @@ class CriterionToOQL extends CriterionConversionAbstract { return "1"; } - $sValue = str_replace('_', '\_', $sValue); return "({$sRef} LIKE '%{$sValue}%')"; } @@ -412,7 +411,7 @@ class CriterionToOQL extends CriterionConversionAbstract // Use the 'below' operator by default $oSearch->AddCondition_PointingTo($oHKFilter, $sAttCode); $oCriteria = $oSearch->GetCriteria(); - $aArgs = MetaModel::PrepareQueryArguments(array(), $oSearch->GetInternalParams()); + $aArgs = MetaModel::PrepareQueryArguments(array(), $oSearch->GetInternalParams(), $oSearch->GetExpectedArguments() ); $oSearch->ResetCondition(); $sCondition = $oCriteria->Render($aArgs); } diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php index 7b77e5f2c..86da53990 100644 --- a/sources/application/search/searchform.class.inc.php +++ b/sources/application/search/searchform.class.inc.php @@ -530,7 +530,7 @@ class SearchForm { $aOrCriterion = array(); $bIsEmptyExpression = true; - $aArgs = MetaModel::PrepareQueryArguments($aArgs, $oSearch->GetInternalParams()); + $aArgs = MetaModel::PrepareQueryArguments($aArgs, $oSearch->GetInternalParams(), $oSearch->GetExpectedArguments()); if ($oSearch instanceof DBObjectSearch) { diff --git a/sources/renderer/bootstrap/fieldrenderer/bsfileuploadfieldrenderer.class.inc.php b/sources/renderer/bootstrap/fieldrenderer/bsfileuploadfieldrenderer.class.inc.php index 642d6b375..299bba55c 100644 --- a/sources/renderer/bootstrap/fieldrenderer/bsfileuploadfieldrenderer.class.inc.php +++ b/sources/renderer/bootstrap/fieldrenderer/bsfileuploadfieldrenderer.class.inc.php @@ -143,7 +143,7 @@ var oTable_{$this->oField->GetGlobalId()}; var buildTable_{$this->oField->GetGlobalId()} = function() { oTable_{$this->oField->GetGlobalId()} = $("table#$sAttachmentTableId").DataTable( { - "dom": "t", + "dom": "tp", "order": [[3, "asc"]], "columnDefs": [ $sDeleteColumnDef diff --git a/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php b/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php index 947f3b310..7449aa05f 100644 --- a/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php +++ b/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php @@ -247,7 +247,7 @@ EOF name: $(me).closest(".form_field").attr("data-field-id"), value: $(me).val() }); - }); + }).on("mouseup", function(){this.focus();}); EOF ); break; diff --git a/synchro/replica.php b/synchro/replica.php index bbfc50da9..166b015ec 100644 --- a/synchro/replica.php +++ b/synchro/replica.php @@ -67,6 +67,7 @@ try $oBlock->Display($oP, 1); break; + case 'delete': case 'select_for_deletion': // Redirect to the page that implements bulk delete $sDelete = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?'.$_SERVER['QUERY_STRING']; diff --git a/synchro/synchro_exec.php b/synchro/synchro_exec.php index d212ca776..df22e9219 100644 --- a/synchro/synchro_exec.php +++ b/synchro/synchro_exec.php @@ -72,6 +72,7 @@ function ReadMandatoryParam($oP, $sParam, $sSanitizationFilter = 'parameter') if (utils::IsModeCLI()) { $oP = new CLIPage(Dict::S("TitleSynchroExecution")); + SetupUtils::CheckPhpAndExtensionsForCli($oP, -2); } else { diff --git a/synchro/synchro_import.php b/synchro/synchro_import.php index 0c065d03a..84b905fc0 100644 --- a/synchro/synchro_import.php +++ b/synchro/synchro_import.php @@ -255,6 +255,7 @@ class CLILikeWebPage extends WebPage if (utils::IsModeCLI()) { $oP = new CLIPage(Dict::S('TitleSynchroExecution')); + SetupUtils::CheckPhpAndExtensionsForCli($oP, -2); } else { diff --git a/test/ItopDataTestCase.php b/test/ItopDataTestCase.php index eddbffcc6..9a26e7c10 100644 --- a/test/ItopDataTestCase.php +++ b/test/ItopDataTestCase.php @@ -713,7 +713,7 @@ class ItopDataTestCase extends ItopTestCase $iId = $oLnk->Get('functionalci_id'); if (!empty($aWaitedCIList)) { - $this->assertTrue(array_key_exists($iId, $aWaitedCIList)); + $this->assertArrayHasKey($iId, $aWaitedCIList); $this->assertEquals($aWaitedCIList[$iId], $oLnk->Get('impact_code')); } } @@ -737,7 +737,7 @@ class ItopDataTestCase extends ItopTestCase $iId = $oLnk->Get('contact_id'); if (!empty($aWaitedContactList)) { - $this->assertTrue(array_key_exists($iId, $aWaitedContactList)); + $this->assertArrayHasKey($iId, $aWaitedContactList); foreach ($aWaitedContactList[$iId] as $sAttCode => $oValue) { if (MetaModel::IsValidAttCode(get_class($oTicket), $sAttCode)) @@ -756,5 +756,29 @@ class ItopDataTestCase extends ItopTestCase $this->iTestOrgId = $oOrg->GetKey(); } - + /** + * Assert that a series of operations will trigger a given number of MySL queries + * + * @param $iExpectedCount Number of MySQL queries that should be executed + * @param callable $oFunction Operations to perform + * + * @throws \MySQLException + * @throws \MySQLQueryHasNoResultException + */ + protected static function assertDBQueryCount($iExpectedCount, callable $oFunction) + { + $iInitialCount = (int) CMDBSource::QueryToScalar("SHOW SESSION STATUS LIKE 'Queries'", 1); + $oFunction(); + $iFinalCount = (int) CMDBSource::QueryToScalar("SHOW SESSION STATUS LIKE 'Queries'", 1); + $iCount = $iFinalCount - 1 - $iInitialCount; + if ($iCount != $iExpectedCount) + { + static::fail("Expected $iExpectedCount queries. $iCount have been executed."); + } + else + { + // Otherwise PHP Unit will consider that no assertion has been made + static::assertTrue(true); + } + } } diff --git a/test/OQL/OQLToSQLTest.php b/test/OQL/OQLToSQLTest.php index d12b03f39..dec00c31e 100644 --- a/test/OQL/OQLToSQLTest.php +++ b/test/OQL/OQLToSQLTest.php @@ -341,6 +341,7 @@ class OQLToSQLTest extends ItopDataTestCase ); $aData = array( + "SELECT UNION 5.6" => array("SELECT `Organization` AS `Organization` WHERE ((`Organization`.`status` != 'inactive') AND (`Organization`.`id` = '1')) UNION SELECT `Organization` AS `Organization` WHERE ((`Organization`.`id` = '1') AND (`Organization`.`id` = '1'))", array(), array(), array(), null, null, 3, 0), "SELECT WebServer 150" => array("SELECT `WebServer` FROM WebServer AS `WebServer` WHERE 1", array(), array(), $aAttToLoad150, null, null, 3, 0), "SELECT WebServer 151" => array("SELECT `WebServer` FROM WebServer AS `WebServer` WHERE 1", array(), array(), array(), null, null, 3, 0), "SELECT L JOIN 176" => array("SELECT `L` FROM Location AS `L` JOIN Person AS `P` ON `P`.location_id = `L`.id WHERE 1", unserialize('a:1:{s:14:"L.friendlyname";b:1;}'), array(), null, null, 3, 0), diff --git a/test/application/UtilsTest.php b/test/application/UtilsTest.php index 9fe2bd0f3..be2819237 100644 --- a/test/application/UtilsTest.php +++ b/test/application/UtilsTest.php @@ -103,6 +103,48 @@ class UtilsTest extends \Combodo\iTop\Test\UnitTest\ItopTestCase ]; } + /** + * @dataProvider LocalPathProvider + * + * @param $sAbsolutePath + * @param $expected + */ + public function testLocalPath($sAbsolutePath, $expected) + { + $this->assertSame($expected, utils::LocalPath($sAbsolutePath)); + + } + + public function LocalPathProvider() + { + return array( + 'index.php' => array( + 'sAbsolutePath' => APPROOT.'index.php', + 'expected' => 'index.php', + ), + 'non existing' => array( + 'sAbsolutePath' => APPROOT.'nonexisting/nonexisting', + 'expected' => false, + ), + 'outside' => array( + 'sAbsolutePath' => '/tmp', + 'expected' => false, + ), + 'application/cmdbabstract.class.inc.php' => array( + 'sAbsolutePath' => APPROOT.'application/cmdbabstract.class.inc.php', + 'expected' => 'application/cmdbabstract.class.inc.php', + ), + 'dir' => array( + 'sAbsolutePath' => APPROOT.'application/.', + 'expected' => 'application', + ), + 'root' => array( + 'sAbsolutePath' => APPROOT.'.', + 'expected' => '', + ), + ); + } + /** * @dataProvider appRootUrlProvider * @covers utils::GetAppRootUrl diff --git a/test/core/CMDBSourceTest.php b/test/core/CMDBSourceTest.php index 6901da313..010d825ce 100644 --- a/test/core/CMDBSourceTest.php +++ b/test/core/CMDBSourceTest.php @@ -101,6 +101,11 @@ class CMDBSourceTest extends ItopTestCase "ENUM('1','2','3') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '1'", "enum('1','2','3') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '1'", ), + 'ENUM with values containing parenthesis' => array( + true, + "ENUM('CSP A','CSP M','NA','OEM(ROC)','OPEN(VL)','RETAIL (Boite)') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci", + "enum('CSP A','CSP M','NA','OEM(ROC)','OPEN(VL)','RETAIL (Boite)') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci", + ), ); } } diff --git a/test/core/DBObjectTest.php b/test/core/DBObjectTest.php index 6c514f72a..9e21de2c4 100644 --- a/test/core/DBObjectTest.php +++ b/test/core/DBObjectTest.php @@ -48,6 +48,7 @@ class DBObjectTest extends ItopDataTestCase /** * Test default page name + * @covers DBObject::GetUIPage */ public function testGetUIPage() { @@ -81,6 +82,9 @@ class DBObjectTest extends ItopDataTestCase array('PHP_INT_MIN', false)); } + /** + * @covers DBObject::GetOriginal + */ public function testGetOriginal() { $oObject = $this->CreateUserRequest(190664); @@ -88,4 +92,114 @@ class DBObjectTest extends ItopDataTestCase static::assertNull($oObject->GetOriginal('sla_tto_passed')); } + /** + * @covers DBObject::NewObject + * @covers DBObject::Get + * @covers DBObject::Set + */ + public function testAttributeRefresh_FriendlyName() + { + $oObject = \MetaModel::NewObject('Person', array('name' => 'Foo', 'first_name' => 'John', 'org_id' => 3, 'location_id' => 2)); + + static::assertEquals('John Foo', $oObject->Get('friendlyname')); + $oObject->Set('name', 'Who'); + static::assertEquals('John Who', $oObject->Get('friendlyname')); + } + + /** + * @covers MetaModel::GetObject + * @covers DBObject::Get + * @covers DBObject::Set + */ + public function testAttributeRefresh_FriendlyNameFromDB() + { + $oObject = \MetaModel::NewObject('Person', array('name' => 'Gary', 'first_name' => 'Romain', 'org_id' => 3, 'location_id' => 2)); + $oObject->DBInsert(); + $iObjKey = $oObject->GetKey(); + + $oObject = \MetaModel::GetObject('Person', $iObjKey); + + static::assertEquals('Romain Gary', $oObject->Get('friendlyname')); + $oObject->Set('name', 'Duris'); + static::assertEquals('Romain Duris', $oObject->Get('friendlyname')); + } + + /** + * @covers DBObject::NewObject + * @covers DBObject::Get + * @covers DBObject::Set + */ + public function testAttributeRefresh_ObsolescenceFlag() + { + $oObject = \MetaModel::NewObject('Person', array('name' => 'Foo', 'first_name' => 'John', 'org_id' => 3, 'location_id' => 2)); + + static::assertEquals(false, (bool)$oObject->Get('obsolescence_flag')); + $oObject->Set('status', 'inactive'); + static::assertEquals(true, (bool)$oObject->Get('obsolescence_flag')); + } + + /** + * @covers DBObject::NewObject + * @covers DBObject::Get + * @covers DBObject::Set + */ + public function testAttributeRefresh_ExternalKeysAndFields() + { + static::assertDBQueryCount(0, function() use (&$oObject){ + $oObject = \MetaModel::NewObject('Person', array('name' => 'Foo', 'first_name' => 'John', 'org_id' => 3, 'location_id' => 2)); + }); + static::assertDBQueryCount(2, function() use (&$oObject){ + static::assertEquals('Demo', $oObject->Get('org_id_friendlyname')); + static::assertEquals('Grenoble', $oObject->Get('location_id_friendlyname')); + }); + + // External key given as an id + static::assertDBQueryCount(1, function() use (&$oObject){ + $oObject->Set('org_id', 2); + static::assertEquals('IT Department', $oObject->Get('org_id_friendlyname')); + }); + + // External key given as an object + static::assertDBQueryCount(1, function() use (&$oBordeaux){ + $oBordeaux = \MetaModel::GetObject('Location', 1); + }); + + static::assertDBQueryCount(0, function() use (&$oBordeaux, &$oObject){ + $oObject->Set('location_id', $oBordeaux); + static::assertEquals('IT Department', $oObject->Get('org_id_friendlyname')); + static::assertEquals('IT Department', $oObject->Get('org_name')); + static::assertEquals('Bordeaux', $oObject->Get('location_id_friendlyname')); + }); + } + + public function testSetExtKeyUnsetDependentAttribute() + { + $oObject = \MetaModel::NewObject('Person', array('name' => 'Foo', 'first_name' => 'John', 'org_id' => 3, 'location_id' => 2)); + $oOrg = \MetaModel::GetObject('Organization', 2); + $oObject->Set('org_id', $oOrg); + static::assertEquals(0, $oObject->Get('location_id')); + } + + /** + * @group Integration + */ + public function testModelExpressions() + { + foreach (\MetaModel::GetClasses() as $sClass) + { + if (\MetaModel::IsAbstract($sClass)) continue; + + $oObject = \MetaModel::NewObject($sClass); + foreach (\MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef) + { + if ($oAttDef->IsBasedOnOQLExpression()) + { + $this->debug("$sClass::$sAttCode"); + static::assertDBQueryCount(0, function() use (&$oObject, &$oAttDef){ + $oObject->EvaluateExpression($oAttDef->GetOQLExpression()); + }); + } + } + } + } } diff --git a/test/core/DBSearchIntersectTest.php b/test/core/DBSearchIntersectTest.php index cd11f97ba..96379b2e4 100644 --- a/test/core/DBSearchIntersectTest.php +++ b/test/core/DBSearchIntersectTest.php @@ -3,7 +3,7 @@ namespace Combodo\iTop\Test\UnitTest\Core; use CMDBSource; -use Combodo\iTop\Test\UnitTest\ItopDataTestCase; +use Combodo\iTop\Test\UnitTest\ItopTestCase; use DBSearch; /** @@ -15,9 +15,8 @@ use DBSearch; * @preserveGlobalState disabled * @backupGlobals disabled */ -class DBSearchIntersectTest extends ItopDataTestCase +class DBSearchIntersectTest extends ItopTestCase { - const USE_TRANSACTION = false; protected function setUp() { @@ -52,6 +51,19 @@ class DBSearchIntersectTest extends ItopDataTestCase { $aTests = array(); + $aTests['Union filtered by parent class'] = array( + 'left' => "SELECT ApplicationSolution UNION SELECT BusinessProcess", + 'right' => "SELECT FunctionalCI WHERE org_id = 3", + 'alias' => "ApplicationSolution", + 'result' => "SELECT `ApplicationSolution` FROM ApplicationSolution AS `ApplicationSolution` WHERE (`ApplicationSolution`.`org_id` = 3) UNION SELECT `BusinessProcess` FROM BusinessProcess AS `BusinessProcess` WHERE (`BusinessProcess`.`org_id` = 3)"); + +// Bug to fix +// $aTests['Test union #2902'] = array( +// 'left' => "SELECT `L-1` FROM ServiceFamily AS `L-1` WHERE 1", +// 'right' => "SELECT `sf` FROM ServiceFamily AS `sf` JOIN Service AS `s` ON `s`.servicefamily_id = `sf`.id JOIN lnkCustomerContractToService AS `l1` ON `l1`.service_id = `s`.id JOIN CustomerContract AS `cc` ON `l1`.customercontract_id = `cc`.id WHERE (`cc`.`org_id` = 3) UNION SELECT `sf` FROM ServiceFamily AS `sf` JOIN Service AS `s` ON `s`.servicefamily_id = `sf`.id JOIN lnkCustomerContractToService AS `l1` ON `l1`.service_id = `s`.id JOIN CustomerContract AS `cc` ON `l1`.customercontract_id = `cc`.id JOIN Organization AS `child` ON `cc`.org_id = `child`.id JOIN Organization AS `root` ON `child`.parent_id BELOW `root`.id WHERE (`root`.`id` = 3)", +// 'alias' => "L-1", +// 'result' => "SELECT `L-1` FROM ServiceFamily AS `L-1` JOIN Service AS `s` ON `s`.servicefamily_id = `L-1`.id JOIN lnkCustomerContractToService AS `l1` ON `l1`.service_id = `s`.id JOIN CustomerContract AS `cc` ON `l1`.customercontract_id = `cc`.id WHERE (`cc`.`org_id` = 3) UNION SELECT `L-1` FROM ServiceFamily AS `L-1` JOIN Service AS `s` ON `s`.servicefamily_id = `L-1`.id JOIN lnkCustomerContractToService AS `l1` ON `l1`.service_id = `s`.id JOIN CustomerContract AS `cc` ON `l1`.customercontract_id = `cc`.id JOIN Organization AS `child` ON `cc`.org_id = `child`.id JOIN Organization AS `root` ON `child`.parent_id BELOW `root`.id WHERE (`root`.`id` = 3)"); + $aTests['Multiple selected classes inverted'] = array( 'left' => "SELECT `L`, `P` FROM Person AS `P` JOIN Location AS `L` ON `P`.location_id = `L`.id WHERE 1", 'right' => "SELECT Person WHERE org_id = 3", @@ -112,6 +124,26 @@ class DBSearchIntersectTest extends ItopDataTestCase 'alias' => "P", 'result' => "SELECT `L` FROM Location AS `L` JOIN Person AS `P` ON `P`.location_id = `L`.id JOIN Location AS `L1` ON `P`.location_id = `L1`.id WHERE (`L1`.`org_id` = 3)"); + $aTests['Test Subclass1'] = array( + 'left' => "SELECT `U` FROM UserRequest AS `U` WHERE `U`.agent_id = 3", + 'right' => "SELECT `Ticket` WHERE org_id = 3", + 'alias' => "U", + 'result' => "SELECT `U` FROM UserRequest AS `U` WHERE ((`U`.`agent_id` = 3) AND (`U`.`org_id` = 3))"); + + $aTests['Test Subclass and join'] = array( + 'left' => "SELECT `UserRequest` FROM UserRequest AS `UserRequest` JOIN Person AS `P` ON `UserRequest`.agent_id = `P`.id WHERE `UserRequest`.agent_id = 3", + 'right' => "SELECT `Ticket` WHERE org_id = 3", + 'alias' => "UserRequest", + 'result' => "SELECT `UserRequest` FROM UserRequest AS `UserRequest` JOIN Person AS `P` ON `UserRequest`.agent_id = `P`.id WHERE ((`UserRequest`.`agent_id` = 3) AND (`UserRequest`.`org_id` = 3))"); + + $aTests['Test Subclass and union'] = array( + 'left' => "SELECT `U` FROM UserRequest AS `U` WHERE `U`.agent_id = 3 UNION SELECT `T` FROM Ticket AS `T` WHERE `T`.agent_id = 3 ", + 'right' => "SELECT `Ticket` WHERE org_id = 3", + 'alias' => "U", + 'result' => "SELECT `U` FROM UserRequest AS `U` WHERE ((`U`.`agent_id` = 3) AND (`U`.`org_id` = 3)) UNION SELECT `T` FROM Ticket AS `T` WHERE ((`T`.`agent_id` = 3) AND (`T`.`org_id` = 3))"); + + + return $aTests; } @@ -422,4 +454,53 @@ class DBSearchIntersectTest extends ItopDataTestCase return $aQueries; } + + /** + * Bug #2970 + * @throws \CoreException + * @throws \CoreWarning + * @throws \OQLException + */ + public function testFilterOnJoin() + { + $sReq1 = "SELECT `L-1` FROM Organization AS `L-1` WHERE (`L-1`.`id` = :current_contact->org_id)"; + $sReq2 = "SELECT `L-1-1` FROM CustomerContract AS `L-1-1` JOIN Organization AS `O` ON `L-1-1`.org_id = `O`.id WHERE (((`L-1-1`.`status` = 'active') OR (`L-1-1`.`status` = 'standby')) AND (`O`.`id` = :current_contact->org_id))"; + + $oFilter1 = DBSearch::FromOQL($sReq1); + $oFilter2 = DBSearch::FromOQL($sReq2); + $aRealiasingMap = array(); + $oFilter1 = $oFilter1->Join($oFilter2, + DBSearch::JOIN_REFERENCED_BY, + 'org_id', + TREE_OPERATOR_EQUALS, $aRealiasingMap); + + $sRes1 = $oFilter1->ToOQL(); + $this->debug($sRes1); + + foreach($oFilter1->GetCriteria_ReferencedBy() as $sForeignClass => $aReferences) + { + foreach ($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator) + { + foreach ($aFiltersByOperator as $iOperatorCode => $aFilters) + { + foreach ($aFilters as $index => $oForeignFilter) + { + $this->debug($oForeignFilter->ToOQL()); + } + } + } + } + + $this->assertFalse(strpos($sRes1, '`O`.')); + + $sReq3 = "SELECT `CustomerContract` FROM CustomerContract AS `CustomerContract` WHERE (`CustomerContract`.`org_id` IN ('2'))"; + $oFilter3 = DBSearch::FromOQL($sReq3); + + $oFilter1 = $oFilter1->Filter('L-1-1', $oFilter3); + + $sRes1 = $oFilter1->ToOQL(); + $this->debug($sRes1); + + $this->assertFalse(strpos($sRes1, '`O`.')); + } } diff --git a/test/core/ExpressionEvaluateTest.php b/test/core/ExpressionEvaluateTest.php new file mode 100644 index 000000000..79d9bc38b --- /dev/null +++ b/test/core/ExpressionEvaluateTest.php @@ -0,0 +1,535 @@ +GetParameters($sParentFilter); + sort($aExpectedParameters); + sort($aParameters); + static::assertEquals($aExpectedParameters, $aParameters); + } + + public function GetParametersProvider() + { + return array( + array('1 AND 0 OR :hello + :world', null, array('hello', 'world')), + array('1 AND 0 OR :hello + :world', 'this', array()), + array(':this->left + :this->right', null, array('this->left', 'this->right')), + array(':this->left + :this->right', 'this', array('left', 'right')), + array(':this->left + :this->right', 'that', array()), + array(':this_left + :this_right', 'this', array()), + ); + } + + /** + * 100x quicker to execute than testExpressionEvaluate + * + * @covers Expression::Evaluate() + * @covers Expression::FromOQL() + * @relies-on-dataProvider VariousExpressions + * @throws \OQLException + */ + public function _testExpressionEvaluateAllAtOnce() + { + $aTestCases = $this->VariousExpressionsProvider(); + foreach ($aTestCases as $sCaseId => $aTestArgs) + { + $this->debug("Case $sCaseId:"); + $this->testVariousExpressions($aTestArgs[0], $aTestArgs[1]); + } + } + + /** + * @covers Expression::Evaluate() + * @covers Expression::FromOQL() + * @dataProvider VariousExpressionsProvider + * + * @param string $sExpression + * @param string $expectedValue + * + * @throws \OQLException + * @throws \Exception + */ + public function testVariousExpressions($sExpression, $expectedValue) + { + $oExpression = Expression::FromOQL($sExpression); + $value = $oExpression->Evaluate(array()); + static::assertEquals($expectedValue, $value); + } + + public function VariousExpressionsProvider() + { + if (false) + { + $aExpressions = array( + // Test case to isolate for troubleshooting purposes + array('1+1', 2), + ); + } + else + { + $aExpressions = array( + // The bare minimum + array('"blah"', 'blah'), + array('"\\\\"', '\\'), + // Arithmetics + array('2+2', 4), + array('2+2-2', 2), + array('2*(3+4)', 14), + array('(2*3)+4', 10), + array('2*3+4', 10), + // Strings + array("CONCAT('hello', 'world')", 'helloworld'), + // Not yet parsed - array("CONCAT_WS(' ', 'hello', 'world')", 'hello world'), + array("SUBSTR('abcdef', 2, 3)", 'bcd'), + array("TRIM(' Sin dolor ')", 'Sin dolor'), + // Comparison operators + array('1 = 1', 1), + array('1 != 1', 0), + array('0 = 1', 0), + array('0 != 1', 1), + array('2 > 1', 1), + array('2 < 1', 0), + array('1 > 2', 0), + array('2 > 1', 1), + array('2 >= 1', 1), + array('2 >= 2', 1), + array("'the quick brown dog' LIKE '%QUICK%'", 1), + array("'the quick brown dog' LIKE '%SLOW%'", 0), + array("'the quick brown dog' LIKE '%QU_CK%'", 1), + array("'the quick brown dog' LIKE '%QU_ICK%'", 0), + array('"400 (km/h)" LIKE "400%"', 1), + array('"400 (km/h)" LIKE "100%"', 0), + array('"2020-06-12" > "2020-06-11"', 1), + array('"2020-06-12" < "2020-06-11"', 0), + array('" 2020-06-12" > "2020-06-11"', 0), // Leading spaces => a string + array('" 2020-06-12 " > "2020-06-11"', 0), // Trailing spaces => a string + array('"2020-06-12 17:35:13" > "2020-06-12 17:35:12"', 1), + array('"2020-06-12 17:35:13" < "2020-06-12 17:35:12"', 0), + array('"2020-06-12 17:35:13" > "2020-06-12"', 1), + array('"2020-06-12 17:35:13" < "2020-06-12"', 0), + array('"2020-06-12 00:00:00" = "2020-06-12"', 0), + // Logical operators + array('0 AND 0', 0), + array('1 AND 0', 0), + array('0 AND 1', 0), + array('1 AND 1', 1), + array('0 OR 0', 0), + array('0 OR 1', 1), + array('1 OR 0', 1), + array('1 OR 1', 1), + array('1 AND 0 OR 1', 1), + // Casting + array('1 AND "blah"', 0), + array('1 AND "1"', 1), + array('1 AND "2"', 1), + array('1 AND "0"', 0), + array('1 AND "-1"', 1), + // Null + array('NULL', null), + array('1 AND NULL', null), + array('CONCAT("Great but...", NULL)', null), + array('COALESCE(NULL, 123)', 123), + array('COALESCE(321, 123)', 321), + array('ISNULL(NULL)', 1), + array('ISNULL(123)', 0), + // Date functions + array("DATE('2020-03-12 13:18:30')", '2020-03-12'), + array("DATE_FORMAT('2009-10-04 22:23:00', '%Y %m %d %H %i %s')", '2009 10 04 22 23 00'), + array("DATE(NOW()) = CURRENT_DATE()", 1), // Could fail if executed around midnight! + array("TO_DAYS('2020-01-02')", 737791), + array("FROM_DAYS(737791)", '2020-01-02'), + array("YEAR('2020-05-03')", 2020), + array("MONTH('2020-05-03')", 5), + array("DAY('2020-05-03')", 3), + array("DATE_ADD('2020-02-28 18:00:00', INTERVAL 1 HOUR)", '2020-02-28 19:00:00'), + array("DATE_ADD('2020-02-28 18:00:00', INTERVAL 1 DAY)", '2020-02-29 18:00:00'), + array("DATE_SUB('2020-03-01 18:00:00', INTERVAL 1 HOUR)", '2020-03-01 17:00:00'), + array("DATE_SUB('2020-03-01 18:00:00', INTERVAL 1 DAY)", '2020-02-29 18:00:00'), + // Misc. functions + array('IF(1, 123, 567)', 123), + array('IF(0, 123, 567)', 567), + array('ELT(3, "a", "b", "c")', 'c'), + array('ELT(0, "a", "b", "c")', null), + array('ELT(4, "a", "b", "c")', null), + array('INET_ATON("128.0.0.1")', 2147483649), + array('INET_NTOA(2147483649)', '128.0.0.1'), + ); + } + + // Build a comprehensive index + $aRet = array(); + foreach ($aExpressions as $aExp) + { + $aRet[$aExp[0]] = $aExp; + } + return $aRet; + } + + /** + * @covers Expression::Evaluate() + * @dataProvider NotYetParsableExpressionsProvider + * + * @param string $sExpression + * @param string $expectedValue + */ + public function testNotYetParsableExpressions($sExpression, $expectedValue) + { + $sNewExpression = "return $sExpression;"; + $oExpression = eval($sNewExpression); + $res = $oExpression->Evaluate(array()); + static::assertEquals($expectedValue, $res); + } + + public function NotYetParsableExpressionsProvider() + { + $aExpressions = array( + array("new \\FunctionExpression('CONCAT_WS', array(new \\ScalarExpression(' '), new \\ScalarExpression('Hello'), new \ScalarExpression('world!')))", 'Hello world!'), + array("new \\ScalarExpression('windows\\system32')", 'windows\\system32'), + array("new \\BinaryExpression(new \\ScalarExpression('100%'), 'LIKE', new \\ScalarExpression('___\%'))", 1), + array("new \\BinaryExpression(new \ScalarExpression('1000'), 'LIKE', new \ScalarExpression('___\%'))", 0), + // Net yet parsed - array("TIME(NOW()) = CURRENT_TIME()", 1), // Not relevant + // Not yet parsed - array("DATE_ADD('2020-02-28 18:00:00', INTERVAL 1 WEEK)", '2020-03-06 18:00:00'), + // Not yet parsed - array("DATE_SUB('2020-03-01 18:00:00', INTERVAL 1 WEEK)", '2020-02-23 18:00:00'), + // Not yet parsed - array('ROUND(1.2345, 2)', 1.23), + // Not yet parsed - array('FLOOR(1.2)', 1), + ); + // Build a comprehensive index + $aRet = array(); + foreach ($aExpressions as $aExp) + { + $aRet[$aExp[0]] = $aExp; + } + return $aRet; + } + + /** + * Check that the test data would give the same result when evaluated by MySQL + * It uses the data provider ExpressionProvider, and checks every test case in one single query + * + * @throws \MySQLException + */ + public function testMySQLEvaluateAllAtOnce() + { + // Expressions given as an OQL + $aTests = array_values($this->VariousExpressionsProvider()); + + // Expressions given as a PHP statement + foreach (array_values($this->NotYetParsableExpressionsProvider()) as $i => $aTest) + { + $sNewExpression = "return {$aTest[0]};"; + $oExpression = eval($sNewExpression); + $sExpression = $oExpression->RenderExpression(true); + $aTests[] = array($sExpression, $aTest[1]); + } + + $aExpressions = array(); + foreach ($aTests as $i => $aTest) + { + $aExpressions[] = "{$aTest[0]} as test_$i"; + } + + $sSelects = implode(', ', $aExpressions); + $sQuery = "SELECT $sSelects"; + + $this->debug($sQuery); + $aResults = CMDBSource::QueryToArray($sQuery); + + foreach ($aTests as $i => $aTest) + { + $value = $aResults[0]["test_$i"]; + $expectedValue = $aTest[1]; + $this->debug("Test #$i: {$aTests[$i][0]} => ".var_export($value, true)); + static::assertEquals($expectedValue, $value); + } + } + + /** + * @covers DBObject::EvaluateExpression + * @dataProvider ExpressionsWithObjectFieldsProvider + * + * @param $sClass + * @param $aValues + * @param $sExpression + * @param $expected + * + * @throws \CoreException + * @throws \OQLException + */ + public function testExpressionsWithObjectFields($sClass, $aValues, $sExpression, $expected) + { + $oObject = MetaModel::NewObject($sClass, $aValues); + $oExpression = Expression::FromOQL($sExpression); + + $res = $oObject->EvaluateExpression($oExpression); + + static::assertEquals($expected, $res); + } + + public function ExpressionsWithObjectFieldsProvider() + { + return array( + array('Location', array('name' => 'Grenoble', 'org_id' => 2), 'org_id', 2), + array('Location', array('name' => 'Grenoble', 'org_id' => 2), 'CONCAT(SUBSTR(name, 4), " cause")', 'noble cause'), + ); + } + + /** + * @dataProvider ExpressionWithParametersProvider + * + * @param $sExpression + * @param $aParameters + * @param $expected + * + * @throws \OQLException + * @throws \Exception + */ + public function testExpressionWithParameters($sExpression, $aParameters, $expected) + { + $oExpression = Expression::FromOQL($sExpression); + $res = $oExpression->Evaluate($aParameters); + static::assertEquals($expected, $res); + } + + public function ExpressionWithParametersProvider() + { + return array( + array('CONCAT(SUBSTR(name, 4), " cause")', array('name' => 'noble'), 'le cause'), + ); + } + + /** + * Check Expression::IfTrue + * + * @covers Expression::FromOQL + * @covers Expression::IsTrue + * @dataProvider TrueExpressionsProvider + * + * @param $sExpression + * @param $bExpectTrue + * + * @throws \OQLException + */ + public function testTrueExpressions($sExpression, $bExpectTrue) + { + $oExpression = Expression::FromOQL($sExpression); + + $res = $oExpression->IsTrue(); + if ($bExpectTrue) + { + static::assertTrue($res, 'arg: '.$sExpression); + } + else + { + static::assertFalse($res, 'arg: '.$sExpression); + } + } + + public function TrueExpressionsProvider() + { + $aExpressions = array( + array('1', true), + array('0 OR 0', false), + array('1 AND 1', true), + array('1 AND (1 OR 0)', true) + ); + // Build a comprehensive index + $aRet = array(); + foreach ($aExpressions as $aExp) + { + $aRet[$aExp[0]] = $aExp; + } + return $aRet; + } + + /** + * @covers FunctionExpression::Evaluate() + * @dataProvider TimeFormatsProvider + * + * @param $sFormat + * @param $bProcessed + * @param $sValueOrException + * + * @throws \CoreException + * @throws \MySQLException + * @throws \MySQLQueryHasNoResultException + * @throws \Exception + */ + public function testTimeFormat($sFormat, $bProcessed, $sValueOrException) + { + $sDate = '2009-06-04 21:23:24'; + $oExpression = new FunctionExpression('DATE_FORMAT', array(new ScalarExpression($sDate), new ScalarExpression("%$sFormat"))); + if ($bProcessed) + { + $sqlValue = CMDBSource::QueryToScalar("SELECT DATE_FORMAT('$sDate', '%$sFormat')"); + static::assertEquals($sqlValue, $sValueOrException, 'Check test against MySQL'); + + $res = $oExpression->Evaluate(array()); + static::assertEquals($sValueOrException, $res, 'Check evaluation'); + } + else + { + static::expectException($sValueOrException); + $oExpression->Evaluate(array()); + } + } + + public function TimeFormatsProvider() + { + $aTests = array( + array('a', true, 'Thu'), + array('b', true, 'Jun'), + array('c', true, '6'), + array('D', true, '4th'), + array('d', true, '04'), + array('e', true, '4'), + array('f', false, 'NotYetEvaluatedExpression'), // microseconds: no way! + array('H', true, '21'), + array('h', true, '09'), + array('I', true, '09'), + array('i', true, '23'), + array('j', true, '155'), // day of the year + array('k', true, '21'), + array('l', true, '9'), + array('M', true, 'June'), + array('m', true, '06'), + array('p', true, 'PM'), + array('r', true, '09:23:24 PM'), + array('S', true, '24'), + array('s', true, '24'), + array('T', true, '21:23:24'), + array('U', false, 'NotYetEvaluatedExpression'), // Week sunday based (mode 0) + array('u', false, 'NotYetEvaluatedExpression'), // Week monday based (mode 1) + array('V', false, 'NotYetEvaluatedExpression'), // Week sunday based (mode 2) + array('v', true, '23'), // Week monday based (mode 3 - ISO-8601) + array('W', true, 'Thursday'), + array('w', true, '4'), + array('X', false, 'NotYetEvaluatedExpression'), + array('x', true, '2009'), // to be used with %v (ISO - 8601) + array('Y', true, '2009'), + array('y', true, '09'), + ); + $aRes = array(); + foreach ($aTests as $aTest) + { + $aRes["Format %{$aTest[0]}"] = $aTest; + } + return $aRes; + } + + /** + * Systematically check all supported format specs, for a given date + * + * @covers FunctionExpression::Evaluate() + * @dataProvider EveryTimeFormatProvider + * + * @param $sDate + * + * @throws \CoreException + * @throws \MySQLException + * @throws \Exception + */ + public function testEveryTimeFormat($sDate) + { + $aFormats = $this->TimeFormatsProvider(); + $aSelects = array(); + foreach ($aFormats as $sFormatDesc => $aFormatSpec) + { + $sFormat = $aFormatSpec[0]; + $bProcessed = $aFormatSpec[1]; + if ($bProcessed) + { + $aSelects["%$sFormat"] = "DATE_FORMAT('$sDate', '%$sFormat') AS `$sFormat`"; + } + } + $sSelects = "SELECT ".implode(', ', $aSelects); + $aRes = CMDBSource::QueryToArray($sSelects); + $aRow = $aRes[0]; + foreach ($aFormats as $sFormatDesc => $aFormatSpec) + { + $sFormat = $aFormatSpec[0]; + $bProcessed = $aFormatSpec[1]; + if ($bProcessed) + { + $oExpression = new FunctionExpression('DATE_FORMAT', array(new ScalarExpression($sDate), new ScalarExpression("%$sFormat"))); + $res = $oExpression->Evaluate(array()); + static::assertEquals($aRow[$sFormat], $res, "Format %$sFormat not matching MySQL for '$sDate'"); + } + } + } + public function EveryTimeFormatProvider() + { + return array( + array('1971-07-19 8:40:00'), + array('1999-12-31 23:59:59'), + array('2000-01-01 00:00:00'), + array('2009-06-04 21:23:24'), + array('2020-02-29 23:59:59'), + array('2030-10-21 23:59:59'), + array('2050-12-21 23:59:59'), + ); + } + + /** + * Systematically check all supported format specs, for a range of dates + * + * @covers FunctionExpression::Evaluate() + * @dataProvider EveryTimeFormatOnDateRangeProvider + * + * @param $sStartDate + * @param $sInterval + * @param $iRepeat + * + * @throws \CoreException + * @throws \MySQLException + * @throws \Exception + */ + public function testEveryTimeFormatOnDateRange($sStartDate, $sInterval, $iRepeat) + { + $oDate = new DateTime($sStartDate); + for ($i = 0 ; $i < $iRepeat ; $i++) + { + $sDate = date_format($oDate, 'Y-m-d, H:i:s'); + $this->debug("Checking '$sDate'"); + $this->testEveryTimeFormat($sDate); + $oDate->add(new DateInterval($sInterval)); + } + } + + public function EveryTimeFormatOnDateRangeProvider() + { + return array( + '10 years, day by day' => array('2000-01-01', 'P1D', 365 * 10), + '1 day, hour by hour' => array('2000-01-01 00:01:02', 'PT1H', 24), + '1 hour, minute by minute' => array('2000-01-01 00:01:02', 'PT1M', 60), + '1 minute, second by second' => array('2000-01-01 00:01:02', 'PT1S', 60), + ); + } +} \ No newline at end of file diff --git a/test/core/ExpressionTest.php b/test/core/ExpressionTest.php new file mode 100644 index 000000000..2ceef3944 --- /dev/null +++ b/test/core/ExpressionTest.php @@ -0,0 +1,47 @@ +ListParameters(); + $aResult = array(); + foreach ($aParameters as $oVarExpr) + { + /** var \VariableExpression $oVarExpr */ + $aResult[] = $oVarExpr->RenderExpression(); + } + $this->debug($aResult); + $this->assertSame(array_diff($aExpected, $aResult), array_diff($aResult, $aExpected)); + } + + public function ListParametersProvider() + { + return array( + array('1', array()), + array(':id = 2', array(':id')), + array('expiration_date < DATE_SUB(NOW(), INTERVAL :expiration_days DAY)', array(':expiration_days')), + array('id IN (SELECT Organization WHERE :id = 2)', array(':id')), + array('id IN (:id, 2)', array(':id')), + array("B.name LIKE :name", array(':name')), + array("name REGEXP :regexp", array(':regexp')), + array(" t.agent_id = :current_contact_id", array(':current_contact_id')), + array("INET_ATON(dev.managementip) > INET_ATON('10.22.32.224') AND INET_ATON(:ip) < INET_ATON('10.22.32.255')", array(':ip')), + ); + } +} diff --git a/test/core/HTMLDOMSanitizerTest.php b/test/core/HTMLDOMSanitizerTest.php index 004b1cc74..46e3de462 100644 --- a/test/core/HTMLDOMSanitizerTest.php +++ b/test/core/HTMLDOMSanitizerTest.php @@ -202,5 +202,117 @@ class HTMLDOMSanitizerTest extends ItopTestCase return true; } + + /** + * @dataProvider RemoveBlackListedTagContentProvider + */ + public function testDoSanitizeRemoveBlackListedTagContent($html, $expected) + { + $oSanitizer = new HTMLDOMSanitizer(); + $sSanitizedHtml = $oSanitizer->DoSanitize($html); + + $this->assertEquals($expected, str_replace("\n", '', $sSanitizedHtml)); + } + + public function RemoveBlackListedTagContentProvider() + { + return array( + 'basic' => array( + 'html' => 'foobaz', + 'expected' => 'foobaz
', + ), + 'basic with body' => array( + 'html' => 'foobaz', + 'expected' => 'foobaz', + ), + 'basic with html and body tags' => array( + 'html' => 'foobaz', + 'expected' => 'foobaz', + ), + 'basic with attributes' => array( + 'html' => 'foobaz', + 'expected' => 'foobaz
', + ), + 'basic with comment' => array( + 'html' => 'foobaz', + 'expected' => 'foobaz
', + ), + 'basic with contentRemovable tag' => array( + 'html' => 'foobaz', + 'expected' => 'foobaz
', + ), + 'nested' => array( + 'html' => 'beforeoofafter', + 'expected' => 'beforeafter
', + ), + 'nested with not closed br' => array( + 'html' => 'beforeoofafter', + 'expected' => 'beforeafter
', + ), + 'nested with allowed' => array( + 'html' => 'beforeafter', + 'expected' => 'beforeafter
', + ), + 'nested with spaces' => array( + 'html' => 'beforeafter', + 'expected' => 'beforeafter
', + ), + 'nested with attributes' => array( + 'html' => 'beforeafter', + 'expected' => 'beforeafter
', + ), + 'nested with allowed and attributes and spaces ' => array( + 'html' => 'beforeafter', + 'expected' => 'beforeafter', + ), + 'nested with allowed and contentRemovable tags' => array( + 'html' => 'beforemiddleafter', + 'expected' => 'beforemiddleafter', + ), + + 'regression: if head present => body is not trimmed' => array( + 'html' => 'bar', + 'expected' => 'bar', + ), + ); + } + + /** + * @dataProvider CallInlineImageProcessImageTagProvider + */ + public function testDoSanitizeCallInlineImageProcessImageTag($sHtml, $iExpectedCount) + { + require_once APPROOT.'test/core/sanitizer/InlineImageMock.php'; + + $oSanitizer = new HTMLDOMSanitizer(); + $oSanitizer->DoSanitize($sHtml); + + $iCalledCount = \InlineImage::GetCallCounter(); + $this->assertEquals($iExpectedCount, $iCalledCount); + } + + public function CallInlineImageProcessImageTagProvider() + { + return array( + 'no image' => array( + 'html' => 'bar
', + 'expected' => 0, + ), + 'basic image' => array( + 'html' => '', + 'expected' => 1, + ), + 'nested images within forbidden tags' => array( + 'html' => '
', + 'expected' => 2, + ), +// This test will be restored with the ticket n°2556 +// 'nested images within forbidden and removed tags' => array( +// 'html' => '
', +// 'expected' => 2, +// ), + ); + } + } diff --git a/test/core/MetaModelTest.php b/test/core/MetaModelTest.php index c0bd95fa9..3ec4e47f9 100644 --- a/test/core/MetaModelTest.php +++ b/test/core/MetaModelTest.php @@ -83,4 +83,100 @@ class MetaModelTest extends ItopDataTestCase ), ); } + + /** + * @covers MetaModel::GetDependentAttributes() + * @dataProvider GetDependentAttributesProvider + * + * @param string $sClass + * @param string $sAttCode + * @param array $aExpectedAttCodes + * + * @throws \Exception + */ + public function testGetDependentAttributes($sClass, $sAttCode, array $aExpectedAttCodes) + { + $aRes = MetaModel::GetDependentAttributes($sClass, $sAttCode); + // The order doesn't matter + sort($aRes); + sort($aExpectedAttCodes); + static::assertEquals($aExpectedAttCodes, $aRes); + } + + public function GetDependentAttributesProvider() + { + $aRawCases = array( + array('Person', 'org_id', array('location_id', 'org_name', 'org_id_friendlyname', 'org_id_obsolescence_flag')), + array('Person', 'name', array('friendlyname')), + array('Person', 'status', array('obsolescence_flag')), + ); + $aRet = array(); + foreach ($aRawCases as $i => $aData) + { + $aRet[$aData[0].'::'.$aData[1]] = $aData; + } + return $aRet; + } + + /** + * @covers MetaModel::GetPrerequisiteAttributes() + * @dataProvider GetPrerequisiteAttributesProvider + * + * @param string $sClass + * @param string $sAttCode + * @param array $aExpectedAttCodes + * + * @throws \Exception + */ + public function testGetPrerequisiteAttributes($sClass, $sAttCode, array $aExpectedAttCodes) + { + $aRes = MetaModel::GetPrerequisiteAttributes($sClass, $sAttCode); + // The order doesn't matter + sort($aRes); + sort($aExpectedAttCodes); + static::assertEquals($aRes, $aExpectedAttCodes); + } + + public function GetPrerequisiteAttributesProvider() + { + $aRawCases = array( + array('Person', 'friendlyname', array('name', 'first_name')), + array('Person', 'obsolescence_flag', array('status')), + array('Person', 'org_id_friendlyname', array('org_id')), + array('Person', 'org_id', array()), + array('Person', 'org_name', array('org_id')), + ); + $aRet = array(); + foreach ($aRawCases as $i => $aData) + { + $aRet[$aData[0].'::'.$aData[1]] = $aData; + } + return $aRet; + } + + /** + * To be removed as soon as the dependencies on external fields are obsoleted + * @Group Integration + */ + public function testManualVersusAutomaticDependenciesOnExtKeys() + { + foreach (\MetaModel::GetClasses() as $sClass) + { + if (\MetaModel::IsAbstract($sClass)) continue; + + foreach (\MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef) + { + if (\MetaModel::GetAttributeOrigin($sClass, $sAttCode) != $sClass) continue; + if (!$oAttDef instanceof \AttributeExternalKey) continue; + + $aManual = $oAttDef->Get('depends_on'); + $aAuto = \MetaModel::GetPrerequisiteAttributes($sClass, $sAttCode); + // The order doesn't matter + sort($aAuto); + sort($aManual); + static::assertEquals($aManual, $aAuto, "Class: $sClass, Attribute: $sAttCode"); + } + } + } + } diff --git a/test/core/OQLTest.php b/test/core/OQLTest.php index e1f74f879..eb7bf7230 100644 --- a/test/core/OQLTest.php +++ b/test/core/OQLTest.php @@ -402,6 +402,7 @@ class OQLTest extends ItopDataTestCase } catch (Exception $e) { + $this->debug($e->getMessage()); $sExceptionClass = get_class($e); } diff --git a/test/core/WeeklyScheduledProcessMockConfig.php b/test/core/WeeklyScheduledProcessMockConfig.php new file mode 100644 index 000000000..236f83797 --- /dev/null +++ b/test/core/WeeklyScheduledProcessMockConfig.php @@ -0,0 +1,36 @@ +oConfig = new Config(); + $this->oConfig->SetModuleSetting(self::MODULE_NAME, self::MODULE_SETTING_ENABLED, $bEnabledValue); + $this->oConfig->SetModuleSetting(self::MODULE_NAME, self::MODULE_SETTING_TIME, $sTimeValue); + $this->oConfig->SetModuleSetting(self::MODULE_NAME, self::MODULE_SETTING_WEEKDAYS, 'monday, tuesday, wednesday, thursday, friday'); + } + + protected function GetModuleName() + { + return self::MODULE_NAME; + } + + protected function GetDefaultModuleSettingTime() + { + return null; // config mock injected in the constructor + } + + public function Process($iUnixTimeLimit) + { + // nothing to do here (not tested) + } +} \ No newline at end of file diff --git a/test/core/WeeklyScheduledProcessTest.php b/test/core/WeeklyScheduledProcessTest.php new file mode 100644 index 000000000..ffd879b64 --- /dev/null +++ b/test/core/WeeklyScheduledProcessTest.php @@ -0,0 +1,67 @@ +getOConfig()->Get('timezone'); + $timezone = new \DateTimeZone($sItopTimeZone); + $oExpectedDateTime = new DateTime($sExpectedTime, $timezone); + + $this->assertEquals($oExpectedDateTime, $oWeeklyImpl->GetNextOccurrence($sCurrentTime)); + } + + public function GetNextOccurrenceProvider() + { + return array( + 'Disabled process' => array(false, 'now', null, '3000-01-01'), + 'working day same day, prog noon and current before noon' => array(true, '2020-05-11 11:00', '12:00', '2020-05-11 12:00'), + 'working day same day, prog noon and current is noon' => array(true, '2020-05-11 12:00', '12:00', '2020-05-12 12:00'), + 'working day same day, prog noon and current after noon' => array(true, '2020-05-11 13:00', '12:00', '2020-05-12 12:00'), + 'saturday, prog noon and current before noon' => array(true, '2020-05-09 11:00', '12:00', '2020-05-11 12:00'), + 'saturday, prog noon and current is noon' => array(true, '2020-05-09 12:00', '12:00', '2020-05-11 12:00'), + 'saturday, prog noon and current after noon' => array(true, '2020-05-09 13:00', '12:00', '2020-05-11 12:00'), + 'sunday, prog noon and current before noon' => array(true, '2020-05-10 11:00', '12:00', '2020-05-11 12:00'), + 'sunday, prog noon and current is noon' => array(true, '2020-05-10 12:00', '12:00', '2020-05-11 12:00'), + 'sunday, prog noon and current after noon' => array(true, '2020-05-10 13:00', '12:00', '2020-05-11 12:00'), + 'working day, day before, prog noon and current before midnight' => array(true, '2020-05-11 23:59', '00:00', '2020-05-12 00:00'), + 'working day same day, prog noon and current is midnight' => array(true, '2020-05-12 00:00', '00:00', '2020-05-13 00:00'), + 'working day same day, prog noon and current after midnight' => array(true, '2020-05-12 00:01', '00:00', '2020-05-13 00:00'), + ); + } +} + diff --git a/test/core/sanitizer/InlineImageMock.php b/test/core/sanitizer/InlineImageMock.php new file mode 100644 index 000000000..d5ad33218 --- /dev/null +++ b/test/core/sanitizer/InlineImageMock.php @@ -0,0 +1,39 @@ + + * + */ + +/** + * Mock class used by @see \Combodo\iTop\Test\UnitTest\Core\HTMLDOMSanitizerTest + * + */ +class InlineImage +{ + private static $iCallCounter = 0; + + public static function ProcessImageTag(DOMNode $oNode) + { + self::$iCallCounter++; + } + + public static function GetCallCounter() + { + return self::$iCallCounter; + } +} \ No newline at end of file diff --git a/test/testlist.inc.php b/test/testlist.inc.php index b02e9ddc7..0a8bfed61 100644 --- a/test/testlist.inc.php +++ b/test/testlist.inc.php @@ -485,7 +485,7 @@ class TestMyBizModel extends TestBizModel echo "Max depth = $iMaxDepth\n"; $oObj = MetaModel::GetObject("cmdbContact", 18); - $aRels = $oObj->GetRelatedObjects("Potes", $iMaxDepth); + $aRels = $oObj->GetRelatedObjectsDown("Potes", $iMaxDepth); echo $oObj->Get('name')." has some 'Potes'...\n"; foreach ($aRels as $sClass => $aObjs) { @@ -581,391 +581,6 @@ class TestMyBizModel extends TestBizModel } -/////////////////////////////////////////////////////////////////////////// -// Test a complex biz model on the fly -/////////////////////////////////////////////////////////////////////////// - -abstract class MyFarm extends TestBizModel -{ - static public function GetConfigFile() {return '/config-test-farm.php';} - - protected function DoPrepare() - { - parent::DoPrepare(); - $this->ResetDB(); - MetaModel::DBCheckIntegrity(); - } - - protected function InsertMammal($sSpecies, $sSex, $iSpeed, $iMotherid, $iFatherId, $sName, $iHeight, $sBirth) - { - $oNew = MetaModel::NewObject('Mammal'); - $oNew->Set('species', $sSpecies); - $oNew->Set('sex', $sSex); - $oNew->Set('speed', $iSpeed); - $oNew->Set('mother', $iMotherid); - $oNew->Set('father', $iFatherId); - $oNew->Set('name', $sName); - $oNew->Set('height', $iHeight); - $oNew->Set('birth', $sBirth); - return $this->ObjectToDB($oNew); - } - - protected function InsertBird($sSpecies, $sSex, $iSpeed, $iMotherid, $iFatherId) - { - $oNew = MetaModel::NewObject('Bird'); - $oNew->Set('species', $sSpecies); - $oNew->Set('sex', $sSex); - $oNew->Set('speed', $iSpeed); - $oNew->Set('mother', $iMotherid); - $oNew->Set('father', $iFatherId); - return $this->ObjectToDB($oNew); - } - - protected function InsertFlyingBird($sSpecies, $sSex, $iSpeed, $iMotherid, $iFatherId, $iFlyingSpeed) - { - $oNew = MetaModel::NewObject('FlyingBird'); - $oNew->Set('species', $sSpecies); - $oNew->Set('sex', $sSex); - $oNew->Set('speed', $iSpeed); - $oNew->Set('mother', $iMotherid); - $oNew->Set('father', $iFatherId); - $oNew->Set('flyingspeed', $iFlyingSpeed); - return $this->ObjectToDB($oNew); - } - - private function InsertGroup($sName, $iLeaderId) - { - $oNew = MetaModel::NewObject('Group'); - $oNew->Set('name', $sName); - $oNew->Set('leader', $iLeaderId); - $iId = $oNew->DBInsertNoReload(); - return $iId; - } -} - - -class TestQueriesOnFarm extends MyFarm -{ - static public function GetName() - { - return 'Farm test'; - } - - static public function GetDescription() - { - return 'A series of tests on the farm business model (SQL generation)'; - } - - protected function CheckQuery($sQuery, $bIsCorrectQuery) - { - if ($bIsCorrectQuery) - { - echo "
$sQuery
\n"; - } - else - { - echo "$sQuery\n"; - } - try - { - //$oOql = new OqlInterpreter($sQuery); - //$oTrash = $oOql->ParseQuery(); - //self::DumpVariable($oTrash, true); - $oMyFilter = DBObjectSearch::FromOQL($sQuery); - } - catch (OQLException $oOqlException) - { - if ($bIsCorrectQuery) - { - echo "
More info on this unexpected failure:
\n"; - throw $oOqlException; - return false; - } - else - { - // Everything is fine :-) - echo "
".$oOqlException->getHtmlDesc()."More info on this expected failure:\n"; - echo "
- \n";
- echo "
- ".get_class($oOqlException)." \n"; - echo "
- ".$oOqlException->getMessage()." \n"; - echo "
- ".$oOqlException->getHtmlDesc()." \n"; - echo "
To OQL: ".$oMyFilter->ToOQL()."
"; - - $this->search_and_show_list($oMyFilter); - - //echo "first pass
\n"; - //self::DumpVariable($oMyFilter, true); - $sQuery1 = $oMyFilter->MakeSelectQuery(); - //echo "
second pass
\n"; - //self::DumpVariable($oMyFilter, true); - //$sQuery1 = $oMyFilter->MakeSelectQuery(); - - $sSerialize = $oMyFilter->serialize(); - echo "
Serialized:$sSerialize
\n"; - $oFilter2 = DBObjectSearch::unserialize($sSerialize); - try - { - $sQuery2 = $oFilter2->MakeSelectQuery(); - } - catch (Exception $e) - { - echo "Could not compute the query after unserialize
\n"; - echo "Query 1: $sQuery1
\n"; - MyHelpers::var_cmp_html($oMyFilter, $oFilter2); - throw $e; - } - //if ($oFilter2 != $oMyFilter) no, they may differ while the resulting query is the same! - if ($sQuery1 != $sQuery2) - { - echo "serialize/unserialize mismatch :-(
\n"; - MyHelpers::var_cmp_html($sQuery1, $sQuery2); - MyHelpers::var_cmp_html($oMyFilter, $oFilter2); - return false; - } - return true; - } - - protected function DoExecute() - { -// $this->ReportError("Found two different OQL expression out of the (same?) filter: $sExpr1 != $sExpr2"); -// $this->ReportSuccess('Found '.$oSet->Count()." objects of class $sClassName"); - echo "Create protagonists...
"; - - $iId1 = $this->InsertMammal('human', 'male', 10, 0, 0, 'romanoff', 192, '1971-07-19'); - $iId2 = $this->InsertMammal('human', 'female', 9, 0, 0, 'rouanita', 165, '1983-01-23'); - $this->InsertMammal('human', 'female', 3, $iId2, $iId1, 'pomme', 169, '2008-02-23'); - $this->InsertMammal('pig', 'female', 3, 0, 0, 'grouinkette', 85, '2006-06-01'); - $this->InsertMammal('donkey', 'female', 3, 0, 0, 'muleta', 124, '2003-11-11'); - - $this->InsertBird('rooster', 'male', 12, 0, 0); - $this->InsertFlyingBird('pie', 'female', 11, 0, 0, 35); - - // Benchmarking - // - if (false) - { - define ('COUNT_BENCHMARK', 10); - echo "Parsing a long query, ".COUNT_BENCHMARK." times
"; - $sQuery = "SELECT Animal AS Child JOIN Mammal AS Dad ON Child.father = Dad.id JOIN Animal AS Mum ON Child.mother = Mum.id WHERE Dad.birth < DATE_SUB(CURRENT_DATE(), INTERVAL 10 YEAR) AND Dad.height * 2 <= ROUND(TO_DAYS(Dad.birth) / (3 + 1) * 5 - 3)"; - - $fStart = MyHelpers::getmicrotime(); - for($i=0 ; $i < COUNT_BENCHMARK ; $i++) - { - $oMyFilter = DBObjectSearch::FromOQL($sQuery); - } - $fDuration = MyHelpers::getmicrotime() - $fStart; - $fParsingDuration = $fDuration / COUNT_BENCHMARK; - echo "Mean time by op: $fParsingDuration
"; - } - - echo "Test queries...
"; - - $aQueries = array( - 'SELECT Animal' => true, - 'SELECT Animal WHERE Animal.pkey = 1' => false, - 'SELECT Animal WHERE Animal.id = 1' => true, - 'SELECT Aniiimal' => false, - 'SELECTe Animal' => false, - 'SELECT * FROM Animal' => false, - 'SELECT Animal AS zoo WHERE zoo.species = \'human\'' => true, - 'SELECT Animal AS zoo WHERE species = \'human\'' => true, - 'SELECT Animal AS zoo WHERE espece = \'human\'' => false, - 'SELECT Animal AS zoo WHERE zoo.species IN (\'human\', "pig")' => true, - 'SELECT Animal AS zoo WHERE CONCATENATION(zoo.species, zoo.sex) LIKE "hum%male"' => false, - 'SELECT Animal AS zoo WHERE CONCAT(zoo.species, zoo.sex) LIKE "hum%male"' => true, - 'SELECT Animal AS zoo WHERE zoo.species NOT IN (\'human\', "pig")' => true, - 'SELECT Animal AS zoo WHERE zoo.kind = \'human\'' => false, - 'SELECT Animal WHERE Animal.species = \'human\' AND Animal.sex = \'female\'' => true, - 'SELECT Mammal AS x WHERE (x.species = \'human\' AND x.name LIKE \'ro%\') OR (x.species = \'donkey\' AND x.name LIKE \'po%\')' => true, - 'SELECT Mammal AS x WHERE x.species = \'human\' AND x.name LIKE \'ro%\' OR x.species = \'donkey\' AND x.name LIKE \'po%\'' => true, - 'SELECT Mammal AS m WHERE MONTH(m.birth) = 7' => true, - 'SELECT Mammal AS m WHERE DAY(m.birth) = 19' => true, - 'SELECT Mammal AS m WHERE YEAR(m.birth) = 1971' => true, - 'SELECT Mammal AS m WHERE m.birth < DATE_SUB(CURRENT_DATE(), INTERVAL 10 YEAR)' => true, - 'SELECT Mammal AS m WHERE m.birth > DATE_SUB(NOW(), INTERVAL 2000 DAY)' => true, - 'SELECT Mammal AS m WHERE (TO_DAYS(NOW()) - TO_DAYS(m.birth)) > 2000' => true, - 'SELECT Mammal AS m WHERE m.name = IF(FLOOR(ROUND(m.height)) > 2, "pomme", "romain")' => true, - 'SELECT Mammal AS m WHERE (1 + 2' => false, - 'SELECT Mammal AS m WHERE (1 + 2 * 4 / 23) > 0' => true, - 'SELECT Mammal AS m WHERE (4 / 23 * 2 + 1) > 0' => true, - 'SELECT Mammal AS m WHERE 1/0' => true, - 'SELECT Mammal AS m WHERE MONTH(m.birth) = 7' => true, - 'SELECT Animal JOIN Group ON Group.leader = Animal.id' => true, - 'SELECT Group JOIN Animal ON Group.leader = Animal.id' => true, - 'SELECT Animal AS A JOIN Group AS G1 ON G1.leader = A.id' => true, - 'SELECT Animal AS A JOIN Group AS G ON FooClass.leader = A.id' => false, - 'SELECT Animal AS A JOIN Group AS G ON G.leader = FooClass.id' => false, - 'SELECT Animal AS A JOIN Group AS G ON G.masterchief = A.id' => false, - 'SELECT Animal AS A JOIN Group AS G ON A.id = G.leader' => false, - 'SELECT Animal AS A JOIN Group AS G ON G.leader = A.id WHERE A.sex=\'male\' OR G.qwerty = 123' => false, - 'SELECT Animal AS A JOIN Group AS G ON G.leader = A.id WHERE A.sex=\'male\' OR G.name LIKE "a%"' => true, - 'SELECT Animal AS A JOIN Group AS G ON G.leader = A.id WHERE A.id = 1' => true, - 'SELECT Animal AS A JOIN Group AS G ON G.leader = A.id WHERE id = 1' => false, - 'SELECT Animal AS A JOIN Group AS G ON A.member = G.id' => false, - 'SELECT Mammal AS M JOIN Group AS G ON M.member = G.id' => true, - 'SELECT Mammal AS M JOIN Group AS G ON A.member = G.id' => false, - 'SELECT Mammal AS myAlias JOIN Group AS myAlias ON myAlias.member = myAlias.id' => false, - 'SELECT Mammal AS Mammal JOIN Group AS Mammal ON Mammal.member = Mammal.id' => false, - 'SELECT Group AS G WHERE G.leader_name LIKE "%"' => true, - 'SELECT Group AS G WHERE G.leader_speed < 100000' => true, - 'SELECT Mammal AS M JOIN Group AS G ON M.member = G.id WHERE G.leader_name LIKE "%"' => true, - 'SELECT Mammal AS M JOIN Group AS G ON M.member = G.id WHERE G.leader_speed < 100000' => true, - 'SELECT Mammal AS Child JOIN Mammal AS Dad ON Child.father = Dad.id' => true, - 'SELECT Mammal AS Child JOIN Animal AS Dad ON Child.father = Dad.id' => true, - 'SELECT Animal AS Child JOIN Mammal AS Dad ON Child.father = Dad.id' => true, - 'SELECT Animal AS Child JOIN Animal AS Dad ON Child.father = Dad.id' => true, - 'SELECT Animal AS Dad JOIN Animal AS Child ON Child.father = Dad.id' => true, - 'SELECT Animal AS Child JOIN Animal AS Dad ON Child.father = Dad.id JOIN Animal AS Mum ON Child.mother = Mum.id' => true, - 'SELECT Animal AS Child JOIN Animal AS Dad ON Child.father = Dad.id JOIN Animal AS Mum ON Child.mother = Mum.id WHERE Dad.id = 1' => true, - 'SELECT Animal AS Child JOIN Animal AS Dad ON Child.father = Dad.id JOIN Animal AS Mum ON Child.mother = Mum.id WHERE Dad.name = \'romanoff\'' => false, - 'SELECT Animal AS Child JOIN Mammal AS Dad ON Child.father = Dad.id' => true, - 'SELECT Animal AS Child JOIN Mammal AS Dad ON Child.father = Dad.id JOIN Animal AS Mum ON Child.mother = Mum.id WHERE Dad.name = \'romanoff\' OR Mum.speed = 0' => true, - 'SELECT Animal AS Dad JOIN Animal AS Child ON Child.father = Dad.id JOIN Animal AS Mum ON Child.mother = Mum.id' => true, - 'SELECT Mammal AS Dad JOIN Mammal AS Child ON Child.father = Dad.id' => true, - 'SELECT Mammal AS Dad JOIN Mammal AS Child ON Child.father = Dad.id JOIN Mammal AS Mum ON Child.mother = Mum.id WHERE Dad.name = \'romanoff\' OR Mum.name=\'chloe\' OR Child.name=\'bizounours\'' => true, - // Specifying multiple objects - 'SELECT Animal FROM Animal' => true, - 'SELECT yelele FROM Animal' => false, - 'SELECT Animal FROM Animal AS A' => false, - 'SELECT A FROM Animal AS A' => true, - ); - //$aQueries = array( - // 'SELECT Mammal AS M JOIN Group AS G ON M.member = G.id WHERE G.leader_name LIKE "%"' => true, - //); - foreach($aQueries as $sQuery => $bIsCorrect) - { - $this->CheckQuery($sQuery, $bIsCorrect); - } - return true; - } -} - - -/////////////////////////////////////////////////////////////////////////// -// Test data load -/////////////////////////////////////////////////////////////////////////// - -class TestBulkChangeOnFarm extends TestBizModel -{ - static public function GetName() - { - return 'Farm test - data load'; - } - - static public function GetDescription() - { - return 'Bulk load'; - } - - static public function GetConfigFile() {return '/config-test-farm.php';} - - protected function DoPrepare() - { - parent::DoPrepare(); - $this->ResetDB(); - MetaModel::DBCheckIntegrity(); - } - - protected function DoExecute() - { -// $this->ReportError("Found two different OQL expression out of the (same?) filter: $sExpr1 != $sExpr2"); -// $this->ReportSuccess('Found '.$oSet->Count()." objects of class $sClassName"); - - $oParser = new CSVParser("denomination,hauteur,age - suzy,123,2009-01-01 - chita,456, - ", ',', '"'); - $aData = $oParser->ToArray(1, array('_name', '_height', '_birth')); - self::DumpVariable($aData); - - $oBulk = new BulkChange( - 'Mammal', - $aData, - // attributes - array('name' => '_name', 'height' => '_height', 'birth' => '_birth'), - // ext keys - array(), - // reconciliation - array('name') - ); - - $oMyChange = MetaModel::NewObject("CMDBChange"); - $oMyChange->Set("date", time()); - $oMyChange->Set("userinfo", "Testor"); - $iChangeId = $oMyChange->DBInsert(); -// echo "Created new change: $iChangeId"; - - echo "Planned for loading...
"; - $aRes = $oBulk->Process(); - self::DumpVariable($aRes); - echo "Go for loading...
"; - $aRes = $oBulk->Process($oMyChange); - self::DumpVariable($aRes); - - return; - - $oRawData = array( - 'Mammal', - array('species', 'sex', 'speed', 'mother', 'father', 'name', 'height', 'birth'), - "human,male,23,0,0,romulus,192,1971 - human,male,23,0,0,remus,154,-50 - human,male,23,0,0,julius,160,-49 - human,female,23,0,0,cleopatra,142,-50 - pig,female,23,0,0,confucius,50,2003" - ); - } -} - - -/////////////////////////////////////////////////////////////////////////// -// Test data load -/////////////////////////////////////////////////////////////////////////// - -class TestFullTextSearchOnFarm extends MyFarm -{ - static public function GetName() - { - return 'Farm test - full text search'; - } - - static public function GetDescription() - { - return 'Focus on the full text search feature'; - } - - protected function DoExecute() - { - echo "Create protagonists...
"; - - $iId1 = $this->InsertMammal('human', 'male', 10, 0, 0, 'romanoff', 192, '1971-07-19'); - $iId2 = $this->InsertMammal('human', 'female', 9, 0, 0, 'rouanita', 165, '1983-01-23'); - $this->InsertMammal('human', 'female', 3, $iId2, $iId1, 'pomme', 169, '2008-02-23'); - $this->InsertMammal('pig', 'female', 3, 0, 0, 'grouinkette', 85, '2006-06-01'); - $this->InsertMammal('donkey', 'female', 3, 0, 0, 'muleta', 124, '2003-11-11'); - - $this->InsertBird('rooster', 'male', 12, 0, 0); - $this->InsertFlyingBird('pie', 'female', 11, 0, 0, 35); - - echo "Search...
"; - $oSearch = new DBObjectSearch('Mammal'); - $oSearch->AddCondition_FullText('manof'); - //$oResultSet = new DBObjectSet($oSearch); - $this->search_and_show_list($oSearch); - } -} - - /////////////////////////////////////////////////////////////////////////// // Test queries /////////////////////////////////////////////////////////////////////////// diff --git a/webservices/cron.php b/webservices/cron.php index 145c758fe..b7717cede 100644 --- a/webservices/cron.php +++ b/webservices/cron.php @@ -60,7 +60,7 @@ function ReadMandatoryParam($oP, $sParam, $sSanitizationFilter = 'parameter') function UsageAndExit($oP) { - $bModeCLI = utils::IsModeCLI(); + $bModeCLI = ($oP instanceof CLIPage); if ($bModeCLI) { @@ -477,9 +477,12 @@ function ReorderProcesses(&$aProcesses, $aTasks, $oNow, $bVerbose, &$oP) set_time_limit(0); // Some background actions may really take long to finish (like backup) -if (utils::IsModeCLI()) +$bIsModeCLI = utils::IsModeCLI(); +if ($bIsModeCLI) { $oP = new CLIPage("iTop - cron"); + + SetupUtils::CheckPhpAndExtensionsForCli($oP, EXIT_CODE_FATAL); } else { @@ -497,7 +500,7 @@ catch (Exception $e) exit(EXIT_CODE_FATAL); } -if (utils::IsModeCLI()) +if ($bIsModeCLI) { // Next steps: // specific arguments: 'csvfile' diff --git a/webservices/export-v2.php b/webservices/export-v2.php index 1fd7d6f01..8b193fc9a 100644 --- a/webservices/export-v2.php +++ b/webservices/export-v2.php @@ -32,6 +32,12 @@ require_once(APPROOT.'/core/bulkexport.class.inc.php'); require_once(APPROOT.'/application/startup.inc.php'); + +const EXIT_CODE_ERROR = -1; +const EXIT_CODE_FATAL = -2; + + + function ReportErrorAndExit($sErrorMessage) { if (utils::IsModeCLI()) @@ -39,14 +45,14 @@ function ReportErrorAndExit($sErrorMessage) $oP = new CLIPage("iTop - Export"); $oP->p('ERROR: '.$sErrorMessage); $oP->output(); - exit(-1); + exit(EXIT_CODE_ERROR); } else { $oP = new WebPage("iTop - Export"); $oP->p('ERROR: '.$sErrorMessage); $oP->output(); - exit(-1); + exit(EXIT_CODE_ERROR); } } @@ -58,7 +64,7 @@ function ReportErrorAndUsage($sErrorMessage) $oP->p('ERROR: '.$sErrorMessage); Usage($oP); $oP->output(); - exit(-1); + exit(EXIT_CODE_ERROR); } else { @@ -66,7 +72,7 @@ function ReportErrorAndUsage($sErrorMessage) $oP->p('ERROR: '.$sErrorMessage); Usage($oP); $oP->output(); - exit(-1); + exit(EXIT_CODE_ERROR); } } @@ -565,6 +571,8 @@ function DoExport(WebPage $oP, BulkExport $oExporter, $bInteractive = false) ///////////////////////////////////////////////////////////////////////////// if (utils::IsModeCLI()) { + SetupUtils::CheckPhpAndExtensionsForCli(new CLIPage('iTop - Export')); + try { // Do this before loging, in order to allow setting user credentials from within the file @@ -573,7 +581,7 @@ if (utils::IsModeCLI()) catch(Exception $e) { echo "Error: ".$e->GetMessage()."
\n"; - exit(-2); + exit(EXIT_CODE_FATAL); } $sAuthUser = utils::ReadParam('auth_user', null, true /* Allow CLI */, 'raw_data'); diff --git a/webservices/export.php b/webservices/export.php index ee127ca32..f19d03eaf 100644 --- a/webservices/export.php +++ b/webservices/export.php @@ -29,6 +29,11 @@ require_once(APPROOT.'/application/excelexporter.class.inc.php'); require_once(APPROOT.'/application/startup.inc.php'); + +const EXIT_CODE_ERROR = -1; +const EXIT_CODE_FATAL = -2; + + try { // Do this before loging, in order to allow setting user credentials from within the file @@ -37,12 +42,15 @@ try catch(Exception $e) { echo "Error: ".$e->GetMessage()."
\n"; - exit -2; + exit(EXIT_CODE_FATAL); } if (utils::IsModeCLI()) { - $sAuthUser = utils::ReadParam('auth_user', null, true /* Allow CLI */, 'raw_data'); + $oP = new CLIPage("iTop - Export"); + SetupUtils::CheckPhpAndExtensionsForCli($oP, EXIT_CODE_FATAL); + + $sAuthUser = utils::ReadParam('auth_user', null, true /* Allow CLI */, 'raw_data'); $sAuthPwd = utils::ReadParam('auth_pwd', null, true /* Allow CLI */, 'raw_data'); if (UserRights::CheckCredentials($sAuthUser, $sAuthPwd)) @@ -51,10 +59,9 @@ if (utils::IsModeCLI()) } else { - $oP = new CLIPage("iTop - Export"); - $oP->p("Access restricted or wrong credentials ('$sAuthUser')"); + $oP->p("Access restricted or wrong credentials ('$sAuthUser')"); $oP->output(); - exit -1; + exit(EXIT_CODE_ERROR); } } else @@ -74,7 +81,7 @@ if (utils::IsArchiveMode() && !UserRights::CanBrowseArchive()) $oP = new CLIPage("iTop - Export"); $oP->p("The user account is not authorized to access the archives"); $oP->output(); - exit -1; + exit(EXIT_CODE_ERROR); } $bLocalize = (utils::ReadParam('no_localize', 0) != 1); diff --git a/webservices/import.php b/webservices/import.php index c43071822..7907bcfcd 100644 --- a/webservices/import.php +++ b/webservices/import.php @@ -212,6 +212,7 @@ function ReadMandatoryParam($oP, $sParam, $sSanitizationFilter) if (utils::IsModeCLI()) { $oP = new CLIPage("iTop - Bulk import"); + SetupUtils::CheckPhpAndExtensionsForCli($oP, -2); } else {