diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index 7381a045a..078d3e2f1 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -759,10 +759,10 @@ HTML
$oPage->SetCurrentTab($sTabCode, $oAttDef->GetLabel().$sCount, $sTabDescription);
$aArgs = array('this' => $this);
-
+
$sEditWhen = $oAttDef->GetEditWhen();
// Calculate if edit_when allows to edit based on current $bEditMode
- $bIsEditableBasedOnEditWhen = ($sEditWhen === LINKSET_EDITWHEN_ALWAYS) ||
+ $bIsEditableBasedOnEditWhen = ($sEditWhen === LINKSET_EDITWHEN_ALWAYS) ||
($bEditMode ? $sEditWhen === LINKSET_EDITWHEN_ON_HOST_EDITION : $sEditWhen === LINKSET_EDITWHEN_ON_HOST_DISPLAY);
$bReadOnly = ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE)) || !$bIsEditableBasedOnEditWhen;
@@ -1218,35 +1218,6 @@ HTML
return DataTableUIBlockFactory::MakeForObject($oPage, $sTableId, $oSet, $aExtraParams);
}
- /**
- * Get the HTML fragment corresponding to the display of a table representing a set of objects
- *
- * @param WebPage $oPage The page object is used for out-of-band information (mostly scripts) output
- * @param \DBObjectSet $oSet The set of objects to display
- * @param array $aExtraParams key used :
- *
- *
view_link : if true then for extkey will display links with friendly name and make column sortable, default true
- *
menu : if true prints DisplayBlock menu, default true
- *
display_aliases : list of query aliases that will be printed, defaults to [] (displays all)
- *
zlist : name of the zlist to use, false to disable zlist lookup, default to 'list'
- *
extra_fields : list of . to add to the result, separator ',', defaults to empty string
- *
- *
- * @return String The HTML fragment representing the table of objects. Warning : no JS added to handled
- * pagination or table sorting !
- *
- * @see DisplayBlock to get a similar table but with the JS for pagination & sorting
- *
- * @deprecated 3.0.0 use GetDisplaySetBlock
- */
- public static function GetDisplaySet(WebPage $oPage, DBObjectSet $oSet, $aExtraParams = array())
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use GetDisplaySetBlock');
- $oPage->AddUiBlock(static::GetDisplaySetBlock($oPage, $oSet, $aExtraParams));
-
- return "";
- }
-
/**
* @param WebPage $oPage
* @param \DBObjectSet $oSet
@@ -1420,129 +1391,6 @@ HTML
//DataTableUIBlockFactory::MakeForStaticData('', $aHeader, $aRows);
}
- /**
- * @param WebPage $oPage
- * @param \CMDBObjectSet $oSet
- * @param array $aExtraParams key used :
- *
- *
view_link : if true then for extkey will display links with friendly name and make column sortable, default true
- *
menu : if true prints DisplayBlock menu, default true
- *
display_aliases : list of query aliases that will be printed, defaults to [] (displays all)
- *
zlist : name of the zlist to use, false to disable zlist lookup, default to 'list'
- *
extra_fields : list of . to add to the result, separator ',', defaults to empty string
- *
- *
- * @return string
- * @throws \CoreException
- * @throws \DictExceptionMissingString
- * @throws \MissingQueryArgument
- * @throws \MySQLException
- * @throws \MySQLHasGoneAwayException
- * @deprecated 3.0.0
- */
- public static function GetDisplayExtendedSet(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = array())
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
- if (empty($aExtraParams['currentId'])) {
- $iListId = utils::GetUniqueId(); // Works only if not in an Ajax page !!
- } else {
- $iListId = $aExtraParams['currentId'];
- }
- $aList = array();
-
- // Initialize and check the parameters
- $bViewLink = isset($aExtraParams['view_link']) ? $aExtraParams['view_link'] : true;
- $bDisplayMenu = isset($aExtraParams['menu']) ? $aExtraParams['menu'] == true : true;
- // Check if there is a list of aliases to limit the display to...
- $aDisplayAliases = isset($aExtraParams['display_aliases']) ? explode(',',
- $aExtraParams['display_aliases']) : array();
- $sZListName = isset($aExtraParams['zlist']) ? ($aExtraParams['zlist']) : 'list';
-
- $aExtraFieldsRaw = isset($aExtraParams['extra_fields']) ? explode(',',
- trim($aExtraParams['extra_fields'])) : array();
- $aExtraFields = array();
- $sAttCode = '';
- foreach($aExtraFieldsRaw as $sFieldName)
- {
- // Ignore attributes not of the main queried class
- if (preg_match('/^(.*)\.(.*)$/', $sFieldName, $aMatches))
- {
- $sClassAlias = $aMatches[1];
- $sAttCode = $aMatches[2];
- if (array_key_exists($sClassAlias, $oSet->GetSelectedClasses()))
- {
- $aExtraFields[$sClassAlias][] = $sAttCode;
- }
- }
- else
- {
- $aExtraFields['*'] = $sAttCode;
- }
- }
-
- $aClasses = $oSet->GetFilter()->GetSelectedClasses();
- $aAuthorizedClasses = array();
- foreach($aClasses as $sAlias => $sClassName)
- {
- if ((UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) != UR_ALLOWED_NO) &&
- ((count($aDisplayAliases) == 0) || (in_array($sAlias, $aDisplayAliases))))
- {
- $aAuthorizedClasses[$sAlias] = $sClassName;
- }
- }
- foreach($aAuthorizedClasses as $sAlias => $sClassName)
- {
- if (array_key_exists($sAlias, $aExtraFields))
- {
- $aList[$sAlias] = $aExtraFields[$sAlias];
- }
- else
- {
- $aList[$sAlias] = array();
- }
- if ($sZListName !== false)
- {
- $aDefaultList = self::FlattenZList(MetaModel::GetZListItems($sClassName, $sZListName));
-
- $aList[$sAlias] = array_merge($aDefaultList, $aList[$sAlias]);
- }
-
- // Filter the list to removed linked set since we are not able to display them here
- foreach ($aList[$sAlias] as $index => $sAttCode)
- {
- $oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode);
- if ($oAttDef instanceof AttributeLinkedSet)
- {
- // Removed from the display list
- unset($aList[$sAlias][$index]);
- }
- }
-
- if (empty($aList[$sAlias]))
- {
- unset($aList[$sAlias], $aAuthorizedClasses[$sAlias]);
- }
- }
-
- $sSelectMode = 'none';
-
- $oDataTable = new DataTable($iListId, $oSet, $aAuthorizedClasses);
-
- $oSettings = DataTableSettings::GetDataModelSettings($aAuthorizedClasses, $bViewLink, $aList);
-
- $bDisplayLimit = isset($aExtraParams['display_limit']) ? $aExtraParams['display_limit'] : true;
- if ($bDisplayLimit)
- {
- $iDefaultPageSize = appUserPreferences::GetPref('default_page_size',
- MetaModel::GetConfig()->GetMinDisplayLimit());
- $oSettings->iDefaultPageSize = $iDefaultPageSize;
- }
-
- $oSettings->aSortOrder = MetaModel::GetOrderByDefault($sClassName);
-
- return $oDataTable->Display($oPage, $oSettings, $bDisplayMenu, $sSelectMode, $bViewLink, $aExtraParams);
- }
-
/**
* @param WebPage $oPage
* @param \CMDBObjectSet $oSet
@@ -1731,7 +1579,7 @@ HTML
* @throws \MySQLException
* @throws \MySQLHasGoneAwayException
* @throws \Exception
- *
+ *
* @internal Only to be used by `/webservices/export.php` : this is a legacy method that produces wrong HTML (no TR on table body rows)
*/
public static function GetSetAsHTMLSpreadsheet(DBObjectSet $oSet, $aParams = array())
@@ -2232,7 +2080,7 @@ JS
);
// test query link
- $sTestResId = 'query_res_'.$sFieldPrefix.$sAttCode.$sNameSuffix; //$oPage->GetUniqueId();
+ $sTestResId = 'query_res_'.$sFieldPrefix.$sAttCode.$sNameSuffix;
$sBaseUrl = utils::GetAbsoluteUrlAppRoot().'pages/run_query.php?expression=';
$sTestQueryLbl = Dict::S('UI:Edit:TestQuery');
$oTestQueryButton = ButtonUIBlockFactory::MakeIconAction(
@@ -2682,7 +2530,7 @@ HTML;
}
break;
}
- $sPattern = addslashes($oAttDef->GetValidationPattern()); //'^([0-9]+)$';
+ $sPattern = addslashes($oAttDef->GetValidationPattern()); //'^([0-9]+)$';
if (!empty($aEventsList))
{
if (!is_numeric($sNullValue))
@@ -3851,7 +3699,7 @@ HTML;
public function GetHilightClass()
{
// Possible return values are:
- // HILIGHT_CLASS_CRITICAL, HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE
+ // HILIGHT_CLASS_CRITICAL, HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE
$current = parent::GetHilightClass(); // Default computation
// Invoke extensions before the deletion (the deletion will do some cleanup and we might loose some information
@@ -4801,66 +4649,6 @@ HTML;
}
}
- /**
- * @param $sCurrentState
- * @param $sStimulus
- * @param $bOnlyNewOnes
- *
- * @return array
- * @throws \ApplicationException
- * @throws \CoreException
- * @deprecated Since iTop 2.4, use DBObject::GetTransitionAttributes() instead.
- */
- public function GetExpectedAttributes($sCurrentState, $sStimulus, $bOnlyNewOnes)
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod('Since iTop 2.4, use DBObject::GetTransitionAttributes() instead');
- $aTransitions = $this->EnumTransitions();
- if (!isset($aTransitions[$sStimulus])) {
- // Invalid stimulus
- throw new ApplicationException(Dict::Format('UI:Error:Invalid_Stimulus_On_Object_In_State', $sStimulus,
- $this->GetName(), $this->GetStateLabel()));
- }
- $aTransition = $aTransitions[$sStimulus];
- $sTargetState = $aTransition['target_state'];
- $aTargetStates = MetaModel::EnumStates(get_class($this));
- $aTargetState = $aTargetStates[$sTargetState];
- $aCurrentState = $aTargetStates[$this->GetState()];
- $aExpectedAttributes = $aTargetState['attribute_list'];
- $aCurrentAttributes = $aCurrentState['attribute_list'];
-
- $aComputedAttributes = array();
- foreach($aExpectedAttributes as $sAttCode => $iExpectCode)
- {
- if (!array_key_exists($sAttCode, $aCurrentAttributes))
- {
- $aComputedAttributes[$sAttCode] = $iExpectCode;
- }
- else
- {
- if (!($aCurrentAttributes[$sAttCode] & (OPT_ATT_HIDDEN | OPT_ATT_READONLY)))
- {
- $iExpectCode = $iExpectCode & ~(OPT_ATT_MUSTPROMPT | OPT_ATT_MUSTCHANGE); // Already prompted/changed, reset the flags
- }
- // Later: better check if the attribute is not *null*
- if (($iExpectCode & OPT_ATT_MANDATORY) && ($this->Get($sAttCode) != ''))
- {
- $iExpectCode = $iExpectCode & ~(OPT_ATT_MANDATORY); // If the attribute is present, then no need to request its presence
- }
-
- $aComputedAttributes[$sAttCode] = $iExpectCode;
- }
-
- $aComputedAttributes[$sAttCode] = $aComputedAttributes[$sAttCode] & ~(OPT_ATT_READONLY | OPT_ATT_HIDDEN); // Don't care about this form now
-
- if ($aComputedAttributes[$sAttCode] == 0)
- {
- unset($aComputedAttributes[$sAttCode]);
- }
- }
-
- return $aComputedAttributes;
- }
-
/**
* Display a form for modifying several objects at once
* The form will be submitted to the current page, with the specified additional values
diff --git a/application/menunode.class.inc.php b/application/menunode.class.inc.php
index c69f1178e..efba8f8a7 100644
--- a/application/menunode.class.inc.php
+++ b/application/menunode.class.inc.php
@@ -358,50 +358,6 @@ class ApplicationMenu
return $aSubMenuNodes;
}
- /**
- * Entry point to display the whole menu into the web page, used by iTopWebPage
- * @param WebPage $oPage
- * @param array $aExtraParams
- * @throws DictExceptionMissingString
- *
- * @deprecated Will be removed in 3.0.0, use static::GetMenuGroups() instead
- */
- public static function DisplayMenu($oPage, $aExtraParams)
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use static::GetMenuGroups() instead');
- self::LoadAdditionalMenus();
- // Sort the root menu based on the rank
- usort(self::$aRootMenus, array('ApplicationMenu', 'CompareOnRank'));
- $iAccordion = 0;
- $iActiveAccordion = $iAccordion;
- $iActiveMenu = self::GetMenuIndexById(self::GetActiveNodeId());
- foreach (self::$aRootMenus as $aMenu) {
- if (!self::CanDisplayMenu($aMenu)) {
- continue;
- }
- $oMenuNode = self::GetMenuNode($aMenu['index']);
- $oPage->AddToMenu('
');
- }
- }
- }
- return $bActive;
- }
-
/**
* Helper function to sort the menus based on their rank
* @param array $a
diff --git a/application/utils.inc.php b/application/utils.inc.php
index 5492c9268..21d5eb1e8 100644
--- a/application/utils.inc.php
+++ b/application/utils.inc.php
@@ -2424,19 +2424,6 @@ SQL;
return $bRet;
}
- /**
- * @param $sPath
- *
- * @return false|\ormDocument
- * @throws \Exception
- *
- * @deprecated 3.2.1 use utils::GetDocumentFromSelfURL instead
- */
- public static function IsSelfURL($sPath)
- {
- return self::GetDocumentFromSelfURL($sPath);
- }
-
/**
* Check if the given URL is a link to download a document/image on the CURRENT iTop
* In such a case we can read the content of the file directly in the database (if the users rights allow) and return the ormDocument
diff --git a/application/wizardhelper.class.inc.php b/application/wizardhelper.class.inc.php
index 6ec4f88a5..020227b51 100644
--- a/application/wizardhelper.class.inc.php
+++ b/application/wizardhelper.class.inc.php
@@ -3,7 +3,7 @@
//
// This file is part of iTop.
//
-// iTop is free software; you can redistribute it and/or modify
+// iTop is free software; you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
@@ -31,7 +31,7 @@ require_once(APPROOT.'/application/uiwizard.class.inc.php');
class WizardHelper
{
protected $m_aData;
-
+
public function __construct()
{
}
@@ -39,7 +39,7 @@ class WizardHelper
* Constructs the PHP target object from the parameters sent to the web page by the wizard
* @param boolean $bReadUploadedFiles True to also read any uploaded file (for blob/document fields)
* @return object
- */
+ */
public function GetTargetObject($bReadUploadedFiles = false)
{
if (isset($this->m_aData['m_oCurrentValues']['id']))
@@ -207,7 +207,7 @@ class WizardHelper
else
{
$oObj->Set($sAttCode, $value);
- }
+ }
}
}
if (isset($this->m_aData['m_sState']) && !empty($this->m_aData['m_sState']))
@@ -217,12 +217,12 @@ class WizardHelper
$oObj->DoComputeValues();
return $oObj;
}
-
+
public function GetFieldsForDefaultValue()
{
return $this->m_aData['m_aDefaultValueRequested'];
}
-
+
public function SetDefaultValue($sAttCode, $value)
{
// Protect against a request for a non existing field
@@ -247,7 +247,7 @@ class WizardHelper
$aData[] = $aRow;
}
$this->m_aData['m_oDefaultValue'][$sAttCode] = json_encode($aData);
-
+
}
else
{
@@ -256,12 +256,12 @@ class WizardHelper
}
}
}
-
+
public function GetFieldsForAllowedValues()
{
return $this->m_aData['m_aAllowedValuesRequested'];
}
-
+
public function SetAllowedValuesHtml($sAttCode, $sHtml)
{
// Protect against a request for a non existing field
@@ -270,12 +270,12 @@ class WizardHelper
$this->m_aData['m_oAllowedValues'][$sAttCode] = $sHtml;
}
}
-
+
public function ToJSON()
{
return json_encode($this->m_aData);
}
-
+
static public function FromJSON($sJSON)
{
$oWizHelper = new WizardHelper();
@@ -283,7 +283,7 @@ class WizardHelper
$oWizHelper->m_aData = $aData;
return $oWizHelper;
}
-
+
protected function GetLinkedWizardStructure($oAttDef)
{
$oWizard = new UIWizard(null, $oAttDef->GetLinkedClass());
@@ -310,7 +310,7 @@ class WizardHelper
}
return $aFields;
}
-
+
public function GetTargetClass()
{
return $this->m_aData['m_sClass'];
@@ -330,7 +330,7 @@ class WizardHelper
{
return isset($this->m_aData['m_sStimulus']) ? $this->m_aData['m_sStimulus'] : null;
}
-
+
public function GetIdForField($sFieldName)
{
$sResult = '';
@@ -375,31 +375,4 @@ JS
);
}
-
- /*
- * Function with an old pattern of code
- * @deprecated 3.1.0
- */
- static function ParseJsonSet($oMe, $sLinkClass, $sExtKeyToMe, $sJsonSet)
- {
- $aSet = json_decode($sJsonSet, true); // true means hash array instead of object
- $oSet = CMDBObjectSet::FromScratch($sLinkClass);
- foreach ($aSet as $aLinkObj) {
- $oLink = MetaModel::NewObject($sLinkClass);
- foreach ($aLinkObj as $sAttCode => $value) {
- $oAttDef = MetaModel::GetAttributeDef($sLinkClass, $sAttCode);
- if (($oAttDef->IsExternalKey()) && ($value != '') && ($value > 0))
- {
- // For external keys: load the target object so that external fields
- // get filled too
- $oTargetObj = MetaModel::GetObject($oAttDef->GetTargetClass(), $value);
- $oLink->Set($sAttCode, $oTargetObj);
- }
- $oLink->Set($sAttCode, $value);
- }
- $oLink->Set($sExtKeyToMe, $oMe->GetKey());
- $oSet->AddObject($oLink);
- }
- return $oSet;
- }
}
diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index b5103b12d..98e6c322f 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -326,18 +326,6 @@ abstract class AttributeDefinition
// table, key field, name field
- /**
- * @return string
- * @deprecated never used
- */
- public function ListDBJoins()
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
-
- return "";
- // e.g: return array("Site", "infrid", "name");
- }
-
public function GetFinalAttDef()
{
return $this;
@@ -927,21 +915,6 @@ abstract class AttributeDefinition
return null;
}
- /**
- * @return mixed|null
- * @deprecated never used
- */
- public function MakeValue()
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
- $sComputeFunc = $this->Get("compute_func");
- if (empty($sComputeFunc)) {
- return null;
- }
-
- return call_user_func($sComputeFunc);
- }
-
abstract public function GetDefaultValue(DBObject $oHostObject = null);
//
diff --git a/core/bulkexport.class.inc.php b/core/bulkexport.class.inc.php
index cdf736728..69d83a42b 100644
--- a/core/bulkexport.class.inc.php
+++ b/core/bulkexport.class.inc.php
@@ -30,7 +30,7 @@ class BulkExportException extends Exception
parent::__construct($message, $code, $previous);
$this->sLocalizedMessage = $sLocalizedMessage;
}
-
+
public function GetLocalizedMessage()
{
return $this->sLocalizedMessage;
@@ -42,7 +42,7 @@ class BulkExportMissingParameterException extends BulkExportException
{
parent::__construct('Missing parameter: '.$sFieldCode, Dict::Format('Core:BulkExport:MissingParameter_Param', $sFieldCode));
}
-
+
}
/**
@@ -146,7 +146,7 @@ abstract class BulkExport
protected $oBulkExportResult;
protected $sTmpFile;
protected $bLocalizeOutput;
-
+
public function __construct()
{
$this->oSearch = null;
@@ -247,7 +247,7 @@ abstract class BulkExport
fclose($hFile);
}
}
-
+
public function GetTmpFilePath()
{
return $this->sTmpFile;
@@ -289,7 +289,7 @@ abstract class BulkExport
{
$this->bLocalizeOutput = $bLocalizeOutput;
}
-
+
/**
* (non-PHPdoc)
* @see iBulkExport::SetObjectList()
@@ -299,12 +299,12 @@ abstract class BulkExport
$oSearch->SetShowObsoleteData($this->aStatusInfo['show_obsolete_data']);
$this->oSearch = $oSearch;
}
-
+
public function SetFormat($sFormatCode)
{
- $this->sFormatCode = $sFormatCode;
+ $this->sFormatCode = $sFormatCode;
}
-
+
/**
* (non-PHPdoc)
* @see iBulkExport::IsFormatSupported()
@@ -322,7 +322,7 @@ abstract class BulkExport
{
return array(); // return array('csv' => Dict::S('UI:ExportFormatCSV'));
}
-
+
public function SetHttpHeaders(WebPage $oPage)
{
@@ -344,7 +344,7 @@ abstract class BulkExport
{
return '';
}
-
+
public function SaveState()
{
if ($this->oBulkExportResult === null)
@@ -362,7 +362,7 @@ abstract class BulkExport
utils::PopArchiveMode();
return $ret;
}
-
+
public function Cleanup()
{
if (($this->oBulkExportResult && (!$this->oBulkExportResult->IsNew())))
@@ -383,16 +383,6 @@ abstract class BulkExport
return array();
}
- /**
- * @deprecated 3.0.0 use GetFormPart instead
- */
- public function DisplayFormPart(WebPage $oP, $sPartId)
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use GetFormPart instead');
- $oP->AddSubBlock($this->GetFormPart($oP, $sPartId));
- }
-
-
/**
* @param WebPage $oP
* @param $sPartId
@@ -412,14 +402,14 @@ abstract class BulkExport
{
$this->bLocalizeOutput = !((bool)utils::ReadParam('no_localize', 0, true, 'integer'));
}
-
+
public function GetResultAsHtml()
{
-
+
}
public function GetRawResult()
{
-
+
}
/**
@@ -441,17 +431,17 @@ abstract class BulkExport
{
return 'UTF-8';
}
-
+
public function GetStatistics()
{
-
+
}
public function SetFields($sFields)
{
}
-
+
public function GetDownloadFileName()
{
return Dict::Format('Core:BulkExportOf_Class', MetaModel::GetName($this->oSearch->GetClass())).'.'.$this->GetFileExtension();
@@ -461,7 +451,7 @@ abstract class BulkExport
{
$this->aStatusInfo = $aStatusInfo;
}
-
+
public function GetStatusInfo()
{
return $this->aStatusInfo;
@@ -493,7 +483,7 @@ abstract class BulkExport
$hFile = @fopen($sFileName, 'x');
}
while($hFile === false);
-
+
fclose($hFile);
return $sFileName;
}
diff --git a/core/cmdbsource.class.inc.php b/core/cmdbsource.class.inc.php
index 8cbf0ee3f..6d70b12fb 100644
--- a/core/cmdbsource.class.inc.php
+++ b/core/cmdbsource.class.inc.php
@@ -363,15 +363,6 @@ class CMDBSource
return static::QueryToScalar('SELECT VERSION()', 0);
}
- /**
- * @deprecated Use `CMDBSource::GetDBVersion` instead.
- * @uses mysqli_get_server_info
- */
- public static function GetServerInfo()
- {
- return mysqli_get_server_info(DbConnectionWrapper::GetDbConnection());
- }
-
/**
* Get the DB vendor between MySQL and its main forks
* @return string
diff --git a/core/dbobject.class.php b/core/dbobject.class.php
index f9454d69d..95c12b828 100644
--- a/core/dbobject.class.php
+++ b/core/dbobject.class.php
@@ -62,7 +62,7 @@ require_once('mutex.class.inc.php');
/**
- * A persistent object, as defined by the metamodel
+ * A persistent object, as defined by the metamodel
*
* @package iTopORM
* @api
@@ -314,9 +314,9 @@ abstract class DBObject implements iDisplay
/**
* Whether the object is already persisted in DB or not.
- *
+ *
* @api
- *
+ *
* @return bool
*/
public function IsNew()
@@ -326,9 +326,9 @@ abstract class DBObject implements iDisplay
/**
* Returns an Id for memory objects
- *
+ *
* @internal
- *
+ *
* @param string $sClass
*
* @return int
@@ -365,7 +365,7 @@ abstract class DBObject implements iDisplay
$sRet .= "$sClass::$iPKey ($sFriendlyname) \n";
return $sRet;
}
-
+
/**
* Alias of DBObject::Reload()
*
@@ -388,7 +388,7 @@ abstract class DBObject implements iDisplay
*
* @internal
* @see m_bFullyLoaded
- *
+ *
* @return bool
* @throws CoreException
*/
@@ -411,11 +411,9 @@ abstract class DBObject implements iDisplay
* This is mostly used after a lazy load (automatically performed by the framework)
* This will erase any pending changes.
*
- * @param bool $bAllowAllData @deprecated This parameter is ignored!!
- *
* @throws CoreException
*/
- public function Reload($bAllowAllData = false)
+ public function Reload()
{
assert($this->m_bIsInDB);
$this->FireEvent(EVENT_DB_OBJECT_RELOAD);
@@ -511,7 +509,7 @@ abstract class DBObject implements iDisplay
{
$aAttList = $aAttToLoad[$sClassAlias];
}
-
+
foreach($aAttList as $sAttCode=>$oAttDef)
{
// Skip links (could not be loaded by the mean of this query)
@@ -571,7 +569,7 @@ abstract class DBObject implements iDisplay
$bFullyLoaded = false;
}
}
-
+
// Load extended data
if ($aExtendedDataSpec != null)
{
@@ -595,7 +593,7 @@ abstract class DBObject implements iDisplay
*
* @internal
* @see Set()
- *
+ *
* @param string $sAttCode
* @param mixed $value
*/
@@ -850,11 +848,11 @@ abstract class DBObject implements iDisplay
/**
* Get the label of an attribute.
- *
+ *
* Shortcut to the field's AttributeDefinition->GetLabel()
*
* @api
- *
+ *
* @param string $sAttCode
*
* @return string
@@ -927,7 +925,7 @@ abstract class DBObject implements iDisplay
*
* @internal
* @see Get
- *
+ *
* @param string $sAttCode
*
* @return int|mixed|null
@@ -1032,7 +1030,7 @@ abstract class DBObject implements iDisplay
* Returns the default value of the $sAttCode.
*
* Returns the default value of the given attribute.
- *
+ *
* @internal
*
* @param string $sAttCode
@@ -1053,12 +1051,12 @@ abstract class DBObject implements iDisplay
* @internal
*
* @return array|null
- */
+ */
public function GetExtendedData()
{
return $this->m_aExtendedData;
}
-
+
/**
* Set the HighlightCode
*
@@ -1080,7 +1078,7 @@ abstract class DBObject implements iDisplay
{
$fCurrentRank = $aHighlightScale[$this->m_sHighlightCode]['rank'];
}
-
+
if (array_key_exists($sCode, $aHighlightScale))
{
$fRank = $aHighlightScale[$sCode]['rank'];
@@ -1090,13 +1088,13 @@ abstract class DBObject implements iDisplay
}
}
}
-
+
/**
* Get the current HighlightCode
- *
+ *
* @internal
* @used-by DBObject::ComputeHighlightCode()
- *
+ *
* @return string|null The Hightlight code (null if none set, meaning rank = 0)
*/
protected function GetHighlightCode()
@@ -1145,7 +1143,7 @@ abstract class DBObject implements iDisplay
* corresponding to the external key and getting the value from it
*
* UNUSED ?
- *
+ *
* @internal
* @todo: check if this is dead code.
*
@@ -1216,7 +1214,7 @@ abstract class DBObject implements iDisplay
/**
* @api
- *
+ *
* @param string $sAttCode
* @param bool $bLocalize
*
@@ -1262,11 +1260,11 @@ abstract class DBObject implements iDisplay
/**
* Get the value as it must be in the edit areas (forms)
- *
+ *
* Makes a raw text representation of the value.
*
* @internal
- *
+ *
* @param string $sAttCode
*
* @return int|mixed|string
@@ -1296,7 +1294,7 @@ abstract class DBObject implements iDisplay
else
{
$sEditValue = 0;
- }
+ }
}
else
{
@@ -1312,14 +1310,14 @@ abstract class DBObject implements iDisplay
/**
* Get $sAttCode formatted as XML
- *
+ *
* The returned value is a text that is suitable for insertion into an XML node.
* Depending on the type of attribute, the returned text is either:
* * A literal, with XML entities already escaped,
* * XML
*
* @api
- *
+ *
* @param string $sAttCode
* @param bool $bLocalize
*
@@ -1357,10 +1355,10 @@ abstract class DBObject implements iDisplay
}
/**
- *
+ *
* @see GetAsHTML()
* @see GetOriginal()
- *
+ *
* @param string $sAttCode
* @param bool $bLocalize
*
@@ -1535,7 +1533,7 @@ abstract class DBObject implements iDisplay
/**
* @internal
- *
+ *
* @param string $sClass
*
* @return mixed
@@ -1590,7 +1588,7 @@ abstract class DBObject implements iDisplay
* Get the id
*
* @api
- *
+ *
* @return string|null
*/
public function GetKey()
@@ -1601,7 +1599,7 @@ abstract class DBObject implements iDisplay
/**
* Primary key Setter
* Usable only for not yet persisted DBObjects
- *
+ *
* @internal
*
* @param int $iNewKey the desired identifier
@@ -1614,7 +1612,7 @@ abstract class DBObject implements iDisplay
{
throw new CoreException("An object id must be an integer value ($iNewKey)");
}
-
+
if ($this->m_bIsInDB && !empty($this->m_iKey) && ($this->m_iKey != $iNewKey))
{
throw new CoreException("Changing the key ({$this->m_iKey} to $iNewKey) on an object (class {".get_class($this).") wich already exists in the Database");
@@ -1624,7 +1622,7 @@ abstract class DBObject implements iDisplay
/**
* Get the icon representing this object
- *
+ *
* @api
*
* @param boolean $bImgTag If true the result is a full IMG tag (or an empty string if no icon is defined)
@@ -1714,7 +1712,7 @@ abstract class DBObject implements iDisplay
*
* Returns the label as defined in the dictionary for the language of the current user
*
- * @api
+ * @api
*
* @return string (empty for default name scheme)
*/
@@ -1781,7 +1779,7 @@ abstract class DBObject implements iDisplay
/**
* Helper to get the state
- *
+ *
* @api
*
* @return mixed|string '' if no state attribute, object representing its value otherwise
@@ -1803,9 +1801,9 @@ abstract class DBObject implements iDisplay
/**
* Get the label (raw text) of the current state
* helper for MetaModel::GetStateLabel()
- *
+ *
* @api
- *
+ *
* @return mixed|string
*
* @throws ArchivedObjectException
@@ -1852,7 +1850,7 @@ abstract class DBObject implements iDisplay
* Define attributes read-only from the end-user perspective
*
* @return array|null List of attcodes
- */
+ */
public static function GetReadOnlyAttributes()
{
return null;
@@ -1861,14 +1859,14 @@ abstract class DBObject implements iDisplay
/**
* Get predefined objects
- *
+ *
* The predefined objects will be synchronized with the DB at each install/upgrade
* As soon as a class has predefined objects, then nobody can create nor delete objects
*
* @internal
*
* @return array An array of id => array of attcode => php value(so-called "real value": integer, string, ormDocument, DBObjectSet, etc.)
- */
+ */
public static function GetPredefinedObjects()
{
return null;
@@ -1997,7 +1995,7 @@ abstract class DBObject implements iDisplay
* Note: Attributes (and flags) from the target state and the transition are combined.
*
* @internal
- *
+ *
* @param string $sStimulus
* @param string $sOriginState Default is current state
*
@@ -2197,7 +2195,7 @@ abstract class DBObject implements iDisplay
/**
* @internal
- *
+ *
* @throws \CoreException
* @throws \OQLException
*
@@ -5323,7 +5321,7 @@ abstract class DBObject implements iDisplay
// Keep track of link changes
//
if (($oLinkSet->GetTrackingLevel() & LINKSET_TRACKING_DETAILS) == 0) continue;
-
+
$iLinkSetOwnerId = $this->Get($sExtKeyAttCode);
$oMyChangeOp = $this->PrepareChangeOpLinkSet($iLinkSetOwnerId, $oLinkSet, 'CMDBChangeOpSetAttributeLinksTune');
if ($oMyChangeOp)
@@ -5520,27 +5518,6 @@ abstract class DBObject implements iDisplay
set_time_limit(intval($iPreviousTimeLimit));
}
- /**
- * Caching relying on an object set is not efficient since 2.0.3
- * Use GetSynchroData instead
- *
- * Get all the synchro replica related to this object
- *
- * @internal
- * @deprecated
- *
- * @return DBObjectSet Set with two columns: R=SynchroReplica S=SynchroDataSource
- * @throws \OQLException
- */
- public function GetMasterReplica()
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
- $sOQL = "SELECT replica,datasource FROM SynchroReplica AS replica JOIN SynchroDataSource AS datasource ON replica.sync_source_id=datasource.id WHERE replica.dest_class = :dest_class AND replica.dest_id = :dest_id";
- $oReplicaSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array() /* order by*/, array('dest_class' => get_class($this), 'dest_id' => $this->GetKey()));
-
- return $oReplicaSet;
- }
-
/**
* Get all the synchro data related to this object
*
diff --git a/core/dbsearch.class.php b/core/dbsearch.class.php
index 90bb38c1b..3aed95306 100644
--- a/core/dbsearch.class.php
+++ b/core/dbsearch.class.php
@@ -236,78 +236,6 @@ abstract class DBSearch
*/
abstract public function IsAny();
- /**
- * @internal
- * @deprecated use ToOQL() instead
- * @return string
- */
- public function Describe()
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use ToOQL() instead');
-
- return 'deprecated - use ToOQL() instead';
- }
-
- /**
- * @internal
- * @deprecated use ToOQL() instead
- * @return string
- */
- public function DescribeConditionPointTo($sExtKeyAttCode, $aPointingTo)
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use ToOQL() instead');
-
- return 'deprecated - use ToOQL() instead';
- }
-
- /**
- * @internal
- * @deprecated use ToOQL() instead
- * @return string
- */
- public function DescribeConditionRefBy($sForeignClass, $sForeignExtKeyAttCode)
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use ToOQL() instead');
-
- return 'deprecated - use ToOQL() instead';
- }
-
- /**
- * @internal
- * @deprecated use ToOQL() instead
- * @return string
- */
- public function DescribeConditionRelTo($aRelInfo)
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use ToOQL() instead');
-
- return 'deprecated - use ToOQL() instead';
- }
-
- /**
- * @internal
- * @deprecated use ToOQL() instead
- * @return string
- */
- public function DescribeConditions()
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use ToOQL() instead');
-
- return 'deprecated - use ToOQL() instead';
- }
-
- /**
- * @internal
- * @deprecated use ToOQL() instead
- * @return string
- */
- public function __DescribeHTML()
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use ToOQL() instead');
-
- return 'deprecated - use ToOQL() instead';
- }
-
/**
* @internal
* @return mixed
@@ -1716,16 +1644,6 @@ abstract class DBSearch
return $this->ToOQL(true);
}
- /**
- * @return array{\VariableExpression}
- *
- * @deprecated use DBSearch::GetExpectedArguments() instead
- */
- public function ListParameters(): array
- {
- return $this->GetExpectedArguments();
- }
-
/**
* Get parameters from the condition expression(s)
*
diff --git a/core/inlineimage.class.inc.php b/core/inlineimage.class.inc.php
index 6d99363d9..f14296681 100644
--- a/core/inlineimage.class.inc.php
+++ b/core/inlineimage.class.inc.php
@@ -110,7 +110,7 @@ class InlineImage extends DBObject
$aCallSpec = array($sClass, 'MapContextParam');
if (is_callable($aCallSpec))
{
- $sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter
+ $sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter
if (MetaModel::IsValidAttCode($sClass, $sAttCode))
{
$iOrgId = $oItem->Get($sAttCode);
@@ -146,7 +146,7 @@ class InlineImage extends DBObject
$aCallSpec = array($sClass, 'MapContextParam');
if (is_callable($aCallSpec))
{
- $sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter
+ $sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter
if (MetaModel::IsValidAttCode($sClass, $sAttCode))
{
// Second: check that the organization CAN be fetched from the current user
@@ -156,7 +156,7 @@ class InlineImage extends DBObject
$aCallSpec = array($sClass, 'MapContextParam');
if (is_callable($aCallSpec))
{
- $sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter
+ $sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter
if (MetaModel::IsValidAttCode($sClass, $sAttCode))
{
// OK - try it
@@ -192,7 +192,7 @@ class InlineImage extends DBObject
if (!is_null($iTransactionId))
{
// Attach new (temporary) inline images
-
+
$sTempId = utils::GetUploadTempId($iTransactionId);
// The object is being created from a form, check if there are pending inline images for this object
$sOQL = 'SELECT InlineImage WHERE temp_id = :temp_id';
@@ -366,10 +366,10 @@ CombodoInlineImage.FixImagesWidth();
JS
;
}
-
+
return $sJS;
}
-
+
/**
* Check if an the given mimeType is an image that can be processed by the system
*
@@ -382,7 +382,7 @@ JS
public static function IsImage($sMimeType)
{
if (!function_exists('gd_info')) return false; // no image processing capability on this system
-
+
$bRet = false;
$aInfo = gd_info(); // What are the capabilities
switch($sMimeType)
@@ -390,19 +390,19 @@ JS
case 'image/gif':
return $aInfo['GIF Read Support'];
break;
-
+
case 'image/jpeg':
return $aInfo['JPEG Support'];
break;
-
+
case 'image/png':
return $aInfo['PNG Support'];
break;
-
+
}
return $bRet;
}
-
+
/**
* Resize an image so that it fits the maximum width/height defined in the config file
* @param ormDocument $oImage The original image stored as an array (content / mimetype / filename)
@@ -444,7 +444,7 @@ JS
}
return $sRet;
}
-
+
/**
* Get the fragment of javascript needed to complete the initialization of
* CKEditor when creating/modifying an object
diff --git a/core/metamodel.class.php b/core/metamodel.class.php
index 377b562f3..3b6c246d6 100644
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -2105,55 +2105,6 @@ abstract class MetaModel
*/
private static $m_aRelationInfos = array();
- /**
- * @deprecated Use EnumRelationsEx instead
- *
- * @param string $sClass
- *
- * @return array multitype:string unknown |Ambigous
- * @throws \CoreException
- * @throws \Exception
- * @throws \OQLException
- */
- public static function EnumRelations($sClass = '')
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod('Use EnumRelationsEx instead');
- $aResult = array_keys(self::$m_aRelationInfos);
- if (!empty($sClass)) {
- // Return only the relations that have a meaning (i.e. for which at least one query is defined)
- // for the specified class
- $aClassRelations = array();
- foreach ($aResult as $sRelCode) {
- $aQueriesDown = self::EnumRelationQueries($sClass, $sRelCode);
- if (count($aQueriesDown) > 0) {
- $aClassRelations[] = $sRelCode;
- }
- // Temporary patch: until the impact analysis GUI gets rewritten,
- // let's consider that "depends on" is equivalent to "impacts/up"
- // The current patch has been implemented in DBObject and MetaModel
- if ($sRelCode == 'impacts') {
- $aQueriesUp = self::EnumRelationQueries($sClass, 'impacts', false);
- if (count($aQueriesUp) > 0)
- {
- $aClassRelations[] = 'depends on';
- }
- }
- }
-
- return $aClassRelations;
- }
-
- // Temporary patch: until the impact analysis GUI gets rewritten,
- // let's consider that "depends on" is equivalent to "impacts/up"
- // The current patch has been implemented in DBObject and MetaModel
- if (in_array('impacts', $aResult))
- {
- $aResult[] = 'depends on';
- }
-
- return $aResult;
- }
-
/**
* @param string $sClass
*
@@ -5143,7 +5094,7 @@ abstract class MetaModel
*/
protected static function DBCreateViews()
{
- [$aErrors, $aSugFix] = self::DBCheckViews();
+ [$aErrors, $aSugFix] = self::DBCleanLegacyViews();
foreach($aSugFix as $sClass => $aTarget)
{
@@ -5789,18 +5740,18 @@ abstract class MetaModel
/**
- * @deprecated 2.7.0 N°2369 Method will not be removed any time soon as we still need to drop view if the instance is migrating from an iTop 2.x to an iTop 3.0 or newer, even if they skip iTop 3.0.
- * @since 3.0.0 Does not recreate SQL views, only drops them. Method has not been renamed to avoid regressions
+ * @internal
+ * @deprecated will be remove when 2.7 will not be supported anymore
*
* @return array
* @throws \CoreException
* @throws \Exception
* @throws \MissingQueryArgument
*/
- public static function DBCheckViews()
+ public static function DBCleanLegacyViews()
{
- $aErrors = array();
- $aSugFix = array();
+ $aErrors = [];
+ $aSugFix = [];
// Reporting views (must be created after any other table)
//
@@ -5815,7 +5766,7 @@ abstract class MetaModel
}
}
- return array($aErrors, $aSugFix);
+ return [$aErrors, $aSugFix];
}
/**
@@ -7509,42 +7460,6 @@ abstract class MetaModel
SetupUtils::rrmdir(utils::GetCachePath($sEnvironment));
}
- /**
- * @internal
- * @param string $sEnvironmentId
- * @deprecated 3.2.1
- */
- public static function ResetCache($sEnvironmentId = null)
- {
- if (is_null($sEnvironmentId))
- {
- $sEnvironmentId = MetaModel::GetEnvironmentId();
- }
-
- $sAppIdentity = 'itop-'.$sEnvironmentId;
- require_once(APPROOT.'/core/dict.class.inc.php');
- Dict::ResetCache($sAppIdentity);
-
- if (function_exists('apc_delete'))
- {
- foreach(self::GetCacheEntries($sEnvironmentId) as $sKey => $aAPCInfo)
- {
- $sAPCKey = $aAPCInfo['info'];
- apc_delete($sAPCKey);
- }
- }
-
- require_once(APPROOT.'core/userrights.class.inc.php');
- UserRights::FlushPrivileges();
-
- // Reset the opcache since otherwise the PHP "model" files may still be cached !!
- if (function_exists('opcache_reset'))
- {
- // Zend opcode cache
- opcache_reset();
- }
- }
-
/**
* Given a field spec, get the most relevant (unique) representation
* Examples for a user request:
diff --git a/core/ormlinkset.class.inc.php b/core/ormlinkset.class.inc.php
index b875fe0b6..1646270a9 100644
--- a/core/ormlinkset.class.inc.php
+++ b/core/ormlinkset.class.inc.php
@@ -240,25 +240,6 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
return $aRet;
}
- /**
- * @param bool $bWithId
- * @return array
- * @deprecated Since iTop 2.4, use foreach($this as $oItem){} instead
- */
- public function ToArray($bWithId = true)
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use foreach($this as $oItem){} instead');
- $aRet = array();
- foreach ($this as $oItem) {
- if ($bWithId) {
- $aRet[$oItem->GetKey()] = $oItem;
- } else {
- $aRet[] = $oItem;
- }
- }
- return $aRet;
- }
-
/**
* @param string $sAttCode
* @param bool $bWithId
diff --git a/core/valuesetdef.class.inc.php b/core/valuesetdef.class.inc.php
index 47c1ac43a..5fed013b0 100644
--- a/core/valuesetdef.class.inc.php
+++ b/core/valuesetdef.class.inc.php
@@ -3,7 +3,7 @@
//
// This file is part of iTop.
//
-// iTop is free software; you can redistribute it and/or modify
+// iTop is free software; you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
@@ -105,7 +105,7 @@ abstract class ValueSetDefinition
/**
- * Set of existing values for an attribute, given a search filter
+ * Set of existing values for an attribute, given a search filter
*
* @package iTopORM
*/
@@ -125,7 +125,7 @@ class ValueSetObjects extends ValueSetDefinition
/**
* @param hash $aOrderBy Array of '[.]attcode' => bAscending
- */
+ */
public function __construct($sFilterExp, $sValueAttCode = '', $aOrderBy = array(), $bAllowAllData = false, $aModifierProperties = array())
{
$this->m_sContains = '';
@@ -146,17 +146,6 @@ class ValueSetObjects extends ValueSetDefinition
$this->m_bIsLoaded = false;
}
- /**
- * @deprecated use SetCondition instead
- *
- * @param \DBSearch $oFilter
- */
- public function AddCondition(DBSearch $oFilter)
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use SetCondition instead');
- $this->SetCondition($oFilter);
- }
-
public function SetCondition(DBSearch $oFilter)
{
$this->m_oExtraCondition = $oFilter;
@@ -457,7 +446,7 @@ class ValueSetObjects extends ValueSetDefinition
/**
- * Fixed set values (could be hardcoded in the business model)
+ * Fixed set values (could be hardcoded in the business model)
*
* @package iTopORM
*/
@@ -542,7 +531,7 @@ class ValueSetEnum extends ValueSetDefinition
foreach (explode(",", $this->m_values) as $sVal)
{
$sVal = trim($sVal);
- $sKey = $sVal;
+ $sKey = $sVal;
$aValues[$sKey] = $sVal;
}
}
@@ -613,7 +602,7 @@ class ValueSetRange extends ValueSetDefinition
/**
- * Data model classes
+ * Data model classes
*
* @package iTopORM
*/
@@ -631,7 +620,7 @@ class ValueSetEnumClasses extends ValueSetEnum
{
// Call the parent to parse the additional values...
parent::LoadValues($aArgs);
-
+
// Translate the labels of the additional values
foreach($this->m_aValues as $sClass => $void)
{
diff --git a/datamodels/2.x/itop-backup/dbrestore.class.inc.php b/datamodels/2.x/itop-backup/dbrestore.class.inc.php
index ffccc9ade..8a0ccc014 100644
--- a/datamodels/2.x/itop-backup/dbrestore.class.inc.php
+++ b/datamodels/2.x/itop-backup/dbrestore.class.inc.php
@@ -3,7 +3,7 @@
//
// This file is part of iTop.
//
-// iTop is free software; you can redistribute it and/or modify
+// iTop is free software; you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
@@ -84,7 +84,7 @@ class DBRestore extends DBBackup
{
$this->LogError("mysql said: $sLine");
}
- if (count($aOutput) == 1)
+ if (count($aOutput) == 1)
{
$sMoreInfo = trim($aOutput[0]);
}
@@ -96,18 +96,6 @@ class DBRestore extends DBBackup
}
}
- /**
- * @deprecated Use RestoreFromCompressedBackup instead
- *
- * @param $sZipFile
- * @param string $sEnvironment
- */
- public function RestoreFromZip($sZipFile, $sEnvironment = 'production')
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod('Use RestoreFromCompressedBackup instead');
- $this->RestoreFromCompressedBackup($sZipFile, $sEnvironment);
- }
-
/**
* Warning : can't be called with a loaded DataModel as we're compiling after restore
*
@@ -180,7 +168,7 @@ class DBRestore extends DBBackup
@chmod($sConfigFile, 0770); // Allow overwriting the file
rename($sDataDir.'/config-itop.php', $sConfigFile);
@chmod($sConfigFile, 0440); // Read-only
-
+
$aExtraFiles = $this->ListExtraFiles($sDataDir);
foreach($aExtraFiles as $sSourceFilePath => $sDestinationFilePath) {
SetupUtils::builddir(dirname($sDestinationFilePath));
diff --git a/datamodels/2.x/itop-portal-base/portal/src/Brick/ManageBrick.php b/datamodels/2.x/itop-portal-base/portal/src/Brick/ManageBrick.php
index 11ed8127f..ababa6596 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Brick/ManageBrick.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Brick/ManageBrick.php
@@ -114,47 +114,6 @@ class ManageBrick extends PortalBrick
self::ENUM_TILE_MODE_TOP,
);
- /** @var array $aPresentationData
- * @deprecated since 3.2.1
- */
- public static $aPresentationData = array(
- self::ENUM_TILE_MODE_BADGE => array(
- 'decorationCssClass' => 'fas fa-id-card fa-2x',
- 'tileTemplate' => 'itop-portal-base/portal/templates/bricks/manage/tile-badge.html.twig',
- 'layoutTemplate' => self::ENUM_PAGE_TEMPLATE_PATH_TABLE,
- 'layoutDisplayMode' => self::ENUM_DISPLAY_MODE_LIST,
- 'need_details' => true,
- ),
- self::ENUM_TILE_MODE_TOP => array(
- 'decorationCssClass' => 'fas fa-signal fa-rotate-270 fa-2x',
- 'tileTemplate' => 'itop-portal-base/portal/templates/bricks/manage/tile-top-list.html.twig',
- 'layoutTemplate' => self::ENUM_PAGE_TEMPLATE_PATH_TABLE,
- 'layoutDisplayMode' => self::ENUM_DISPLAY_MODE_LIST,
- 'need_details' => true,
- ),
- self::ENUM_TILE_MODE_PIE => array(
- 'decorationCssClass' => 'fas fa-chart-pie fa-2x',
- 'tileTemplate' => 'itop-portal-base/portal/templates/bricks/manage/tile-chart.html.twig',
- 'layoutTemplate' => self::ENUM_PAGE_TEMPLATE_PATH_CHART,
- 'layoutDisplayMode' => self::ENUM_DISPLAY_MODE_PIE,
- 'need_details' => false,
- ),
- self::ENUM_TILE_MODE_BAR => array(
- 'decorationCssClass' => 'fas fa-chart-bar fa-2x',
- 'tileTemplate' => 'itop-portal-base/portal/templates/bricks/manage/tile-chart.html.twig',
- 'layoutTemplate' => self::ENUM_PAGE_TEMPLATE_PATH_CHART,
- 'layoutDisplayMode' => self::ENUM_DISPLAY_MODE_BAR,
- 'need_details' => false,
- ),
- self::ENUM_TILE_MODE_TEXT => array(
- 'decorationCssClass' => 'fas fa-pen-square fa-2x',
- 'tileTemplate' => self::DEFAULT_TILE_TEMPLATE_PATH,
- 'layoutTemplate' => self::ENUM_PAGE_TEMPLATE_PATH_TABLE,
- 'layoutDisplayMode' => self::ENUM_DISPLAY_MODE_LIST,
- 'need_details' => true,
- ),
- );
-
/** @var array $aDefaultTileData */
private static array $aDefaultTileData = [
self::ENUM_TILE_MODE_BADGE => [
@@ -261,31 +220,6 @@ class ManageBrick extends PortalBrick
$this->AddGrouping('areas', array('attribute' => 'finalclass'));
}
- /**
- * Returns true if the $sDisplayMode need objects details for rendering.
- *
- * @deprecated since 3.2.1
- *
- * @param string $sDisplayMode
- *
- * @return bool
- */
- static public function AreDetailsNeededForDisplayMode($sDisplayMode)
- {
- $bNeedDetails = false;
- foreach (static::$aPresentationData as $aData)
- {
- if ($aData['layoutDisplayMode'] === $sDisplayMode)
- {
- $bNeedDetails = $aData['need_details'];
- break;
- }
- }
-
- return $bNeedDetails;
- }
-
-
/**
* Returns if the $sLayoutMode need objects details for rendering.
*
@@ -300,29 +234,6 @@ class ManageBrick extends PortalBrick
return static::$aDefaultLayoutData[$sLayoutMode]['need_details'];
}
- /**
- * Returns the page template path for the $sDisplayMode
- *
- * @deprecated since 3.2.1
- *
- * @param string $sDisplayMode
- * @return string
- */
- static public function GetPageTemplateFromDisplayMode($sDisplayMode)
- {
- $sTemplate = static::DEFAULT_PAGE_TEMPLATE_PATH;
- foreach (static::$aPresentationData as $aData)
- {
- if ($aData['layoutDisplayMode'] === $sDisplayMode)
- {
- $sTemplate = $aData['layoutTemplate'];
- break;
- }
- }
-
- return $sTemplate;
- }
-
/**
* Returns the page template path for the $sDisplayMode
*
@@ -450,14 +361,6 @@ class ManageBrick extends PortalBrick
return $this->sTileMode;
}
- /**
- * @deprecated since 3.2.1
- */
- public function GetDecorationCssClass()
- {
- return static::$aPresentationData[$this->sTileMode]['decorationCssClass'];
- }
-
/**
* @since 3.2.1
*
@@ -482,23 +385,6 @@ class ManageBrick extends PortalBrick
return $this;
}
- /**
- * @deprecated since 3.2.1
- *
- * @param string $sTileMode
- *
- * @return string[] parameters for specified type, default parameters if type is invalid
- */
- public function GetPresentationDataForTileMode($sTileMode)
- {
- if (isset(static::$aPresentationData[$sTileMode]))
- {
- return static::$aPresentationData[$sTileMode];
- }
-
- return static::$aPresentationData[static::DEFAULT_TILE_MODE];
- }
-
/**
* @return mixed
*/
@@ -587,7 +473,7 @@ class ManageBrick extends PortalBrick
/**
* Returns the default lists length to display
- *
+ *
* @return int
*/
public function GetDefaultListLength()
@@ -597,9 +483,9 @@ class ManageBrick extends PortalBrick
/**
* Sets the default lists length to display
- *
+ *
* @param int $iDefaultListLength
- *
+ *
* @return $this
*/
public function SetDefaultListLength($iDefaultListLength) {
diff --git a/datamodels/2.x/itop-portal-base/portal/src/Brick/PortalBrick.php b/datamodels/2.x/itop-portal-base/portal/src/Brick/PortalBrick.php
index 0599b9e96..0c6ba6fdc 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Brick/PortalBrick.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Brick/PortalBrick.php
@@ -86,8 +86,6 @@ abstract class PortalBrick extends AbstractBrick
protected $sDecorationClassHome;
/** @var string $sDecorationClassNavigationMenu */
protected $sDecorationClassNavigationMenu;
- /** @var string $sTileTemplatePath @deprecated since 3.2.1 */
- protected $sTileTemplatePath;
/** @var string|null $sTileControllerAction */
protected $sTileControllerAction;
/** @var string $sOpeningTarget */
@@ -136,9 +134,6 @@ abstract class PortalBrick extends AbstractBrick
$this->bVisibleNavigationMenu = static::DEFAULT_VISIBLE_NAVIGATION_MENU;
$this->sDecorationClassHome = static::DEFAULT_DECORATION_CLASS_HOME;
$this->sDecorationClassNavigationMenu = static::DEFAULT_DECORATION_CLASS_NAVIGATION_MENU;
- // BEGIN cleaning 3.2.1 deprecated
- $this->sTileTemplatePath = static::DEFAULT_TILE_TEMPLATE_PATH;
- // END cleaning 3.2.1 deprecated
$this->sTileControllerAction = static::DEFAULT_TILE_CONTROLLER_ACTION;
$this->sOpeningTarget = static::DEFAULT_OPENING_TARGET;
}
@@ -263,18 +258,6 @@ abstract class PortalBrick extends AbstractBrick
return $this->sTileControllerAction;
}
- /**
- * Returns the brick tile template path
- *
- * @return string
- *
- * @deprecated since 3.2.1 use GetTemplatePath('tile') instead
- */
- public function GetTileTemplatePath()
- {
- return $this->GetTemplatePath('tile');
- }
-
/**
* Returns the brick's objects opening target (modal, new tab, current window)
*
@@ -439,23 +422,6 @@ abstract class PortalBrick extends AbstractBrick
return $this;
}
- /**
- * Sets the brick tile template path
- *
- * @param string $sTileTemplatePath
- *
- * @return \Combodo\iTop\Portal\Brick\PortalBrick
- *
- * @deprecated since 3.2.1 use SetTemplatePath('tile') instead
- */
- public function SetTileTemplatePath($sTileTemplatePath)
- {
- $this->sTileTemplatePath = $sTileTemplatePath;
- $this->SetTemplatePath('tile', $sTileTemplatePath);
-
- return $this;
- }
-
/**
* Sets the brick tile controller action
*
diff --git a/datamodels/2.x/itop-portal-base/portal/src/Helper/ApplicationHelper.php b/datamodels/2.x/itop-portal-base/portal/src/Helper/ApplicationHelper.php
index cbd7c6a4f..747edae3f 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Helper/ApplicationHelper.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Helper/ApplicationHelper.php
@@ -49,45 +49,6 @@ class ApplicationHelper
/** @var bool FORM_DEFAULT_ALWAYS_SHOW_SUBMIT */
const FORM_DEFAULT_ALWAYS_SHOW_SUBMIT = false;
- /**
- * Loads classes from the base portal
- *
- * @param string $sScannedDir Directory to load the files from
- * @param string $sFilePattern Pattern of files to load
- * @param string $sType Type of files to load, used only in the Exception message, can be anything
- *
- * @throws \Exception
- * @deprecated Since 2.7.0
- *
- */
- public static function LoadClasses($sScannedDir, $sFilePattern, $sType)
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
- @trigger_error(
- sprintf(
- 'Usage of legacy LoadClasses is deprecated. You should rely on autoloading (and therefore follow PSR4).',
- __FILE__
- ),
- E_USER_DEPRECATED
- );
-
- // Loading classes from base portal
- foreach (scandir($sScannedDir) as $sFile)
- {
- if (strpos($sFile, $sFilePattern) !== false && file_exists($sFilepath = $sScannedDir.'/'.$sFile))
- {
- try
- {
- require_once $sFilepath;
- }
- catch (Exception $e)
- {
- throw new Exception('Error while trying to load '.$sType.' '.$sFile);
- }
- }
- }
- }
-
/**
* Loads the brick's security from the OQL queries to profiles arrays
*
diff --git a/datamodels/2.x/itop-portal-base/portal/src/Kernel.php b/datamodels/2.x/itop-portal-base/portal/src/Kernel.php
index dc7e6cea2..d4f6b6502 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Kernel.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Kernel.php
@@ -105,22 +105,4 @@ class Kernel extends BaseKernel
$routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS);
$routes->import($confDir.'/{routes}'.self::CONFIG_EXTS);
}
-
-
- /**
- * Checks if a given class name belongs to an active bundle.
- *
- * @param string $class A class name
- *
- * @return void true if the class belongs to an active bundle, false otherwise
- *
- * @api
- *
- * @deprecated Deprecated since version 2.6, to be removed in 3.0.
- */
- public function isClassInActiveBundle($class)
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
- // TODO: Implement isClassInActiveBundle() method.
- }
}
diff --git a/pages/UI.php b/pages/UI.php
index c8efc163e..abe2d8a2c 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -70,7 +70,7 @@ function ApplyNextAction(Webpage $oP, CMDBObject $oObj, $sNextAction)
}
// Get the list of missing mandatory fields for the target state, considering only the changes from the previous form (i.e don't prompt twice)
$aExpectedAttributes = $oObj->GetTransitionAttributes($sNextAction);
-
+
if (count($aExpectedAttributes) == 0)
{
// If all the mandatory fields are already present, just apply the transition silently...
@@ -89,7 +89,7 @@ function ApplyNextAction(Webpage $oP, CMDBObject $oObj, $sNextAction)
// redirect to the 'stimulus' action
$oAppContext = new ApplicationContext();
//echo "
Missing Attributes
".print_r($aExpectedAttributes, true)."
\n";
-
+
$oP->add_header('Location: '.utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=stimulus&class='.get_class($oObj).'&stimulus='.$sNextAction.'&id='.$oObj->getKey().$oAppContext->GetForLink(true));
}
}
@@ -247,7 +247,7 @@ function DisplayMultipleSelectionForm(WebPage $oP, DBSearch $oFilter, string $sN
$aExtraParams['surround_with_panel'] = true;
if(array_key_exists('icon', $aDisplayParams)){
$aExtraParams['panel_icon'] = $aDisplayParams['icon'];
- }
+ }
if(array_key_exists('title', $aDisplayParams)){
$aExtraParams['panel_title'] = $aDisplayParams['title'];
}
@@ -295,7 +295,7 @@ function DisplayNavigatorGroupTab($oP)
}
/***********************************************************************************
- *
+ *
* Main user interface page starts here
*
***********************************************************************************/
@@ -1394,7 +1394,6 @@ try
///////////////////////////////////////////////////////////////////////////////////////////
- case 'swf_navigator': /** @deprecated SWF was removed in iTop */
case 'view_relations': // Graphical display of the relations "impact" / "depends on"
require_once(APPROOT.'core/simplegraph.class.inc.php');
require_once(APPROOT.'core/relationgraph.class.inc.php');
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index 465650ea0..7a9b97e55 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -2222,15 +2222,6 @@ EOF
$oPage->add("");
break;
- /**
- * @internal
- * @deprecated 3.2.0 N°7552 Use object.search_for_mentions route instead
- */
- case 'cke_mentions':
- $oController = new ObjectController();
- $oPage = $oController->OperationSearchForMentions();
- break;
-
case 'custom_fields_update':
$oPage = new JsonPage();
$sAttCode = utils::ReadParam('attcode', '');
diff --git a/pages/csvimport.php b/pages/csvimport.php
index e39e841c8..4213b7937 100644
--- a/pages/csvimport.php
+++ b/pages/csvimport.php
@@ -51,27 +51,6 @@ try {
$oPage = new iTopWebPage(Dict::S('UI:Title:BulkImport'));
$oPage->SetBreadCrumbEntry('ui-tool-bulkimport', Dict::S('Menu:CSVImportMenu'), Dict::S('UI:Title:BulkImport+'), '', 'fas fa-file-import', iTopWebPage::ENUM_BREADCRUMB_ENTRY_ICON_TYPE_CSS_CLASSES);
- /**
- * Helper function to build a select from the list of valid classes for a given action
- *
- * @deprecated 3.0.0 use GetClassesSelectUIBlock
- *
- * @param $sDefaultValue
- * @param integer $iWidthPx The width (in pixels) of the drop-down list
- * @param integer $iActionCode The ActionCode (from UserRights) to check for authorization for the classes
- *
- * @param string $sName The name of the select in the HTML form
- *
- * @return string The HTML fragment corresponding to the select tag
- */
- function GetClassesSelect($sName, $sDefaultValue, $iWidthPx, $iActionCode = null)
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use GetClassesSelectUIBlock');
- $oSelectBlock = GetClassesSelectUIBlock($sName, $sDefaultValue, $iActionCode);
-
- return BlockRenderer::RenderBlockTemplates($oSelectBlock);
- }
-
/**
* Helper function to build a select from the list of valid classes for a given action
*
diff --git a/setup/modelfactory.class.inc.php b/setup/modelfactory.class.inc.php
index ff26c5ed8..d2b56e801 100644
--- a/setup/modelfactory.class.inc.php
+++ b/setup/modelfactory.class.inc.php
@@ -1280,29 +1280,6 @@ class ModelFactory
$this->aDict = array();
}
- /**
- * XML load errors (XML format and validation)
- *
- * @Deprecated Errors are now sent by Exception
- */
- function HasLoadErrors()
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod('Errors are now sent by Exception');
-
- return (count(self::$aLoadErrors) > 0);
- }
-
- /**
- * @Deprecated Errors are now sent by Exception
- * @return array
- */
- function GetLoadErrors()
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod('Errors are now sent by Exception');
-
- return self::$aLoadErrors;
- }
-
/**
* @param array $aErrors
*
@@ -2124,7 +2101,7 @@ class MFElement extends Combodo\iTop\DesignElement
*/
public function IsInDefinition()
{
- // Iterate through the parents: reset the flag if any of them has a flag set
+ // Iterate through the parents: reset the flag if any of them has a flag set
for ($oParent = $this; $oParent instanceof MFElement; $oParent = $oParent->parentNode)
{
if ($oParent->GetAlteration() != '')
diff --git a/sources/Application/WebPage/AjaxPage.php b/sources/Application/WebPage/AjaxPage.php
index 18e295dc2..9af7c693e 100644
--- a/sources/Application/WebPage/AjaxPage.php
+++ b/sources/Application/WebPage/AjaxPage.php
@@ -24,7 +24,6 @@ class AjaxPage extends WebPage implements iTabbedPage
* @var array
*/
protected $m_oTabs;
- private $m_sMenu; // If set, then the menu will be updated
const DEFAULT_PAGE_TEMPLATE_REL_PATH = 'pages/backoffice/ajaxpage/layout';
/** @var string */
@@ -55,7 +54,6 @@ class AjaxPage extends WebPage implements iTabbedPage
$this->m_oTabs = new TabManager();
$this->sContentType = 'text/html';
$this->sContentDisposition = 'inline';
- $this->m_sMenu = "";
$this->sPromiseId = utils::ReadParam('ajax_promise_id', uniqid('ajax_', true));
utils::InitArchiveMode();
@@ -173,17 +171,6 @@ class AjaxPage extends WebPage implements iTabbedPage
$this->add_ready_script($this->m_oTabs->SelectTab($sTabContainer, $sTabCode));
}
- /**
- * @param string $sHtml
- *
- * @deprecated Will be removed in 3.0.0
- */
- public function AddToMenu($sHtml)
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
- $this->m_sMenu .= $sHtml;
- }
-
/**
* @inheritDoc
*/
@@ -342,7 +329,7 @@ class AjaxPage extends WebPage implements iTabbedPage
{
assert(false);
}
-
+
/**
* @inheritDoc
*/
diff --git a/sources/Application/WebPage/NiceWebPage.php b/sources/Application/WebPage/NiceWebPage.php
index bebfea552..babd1d46c 100644
--- a/sources/Application/WebPage/NiceWebPage.php
+++ b/sources/Application/WebPage/NiceWebPage.php
@@ -60,11 +60,6 @@ class NiceWebPage extends WebPage
// - SearchForm
'js/searchformforeignkeys.js',
];
- /** @inheritDoc */
- protected const COMPATIBILITY_DEPRECATED_LINKED_SCRIPTS_REL_PATH = [
- /** @deprecated 3.0.0 Not used in the backoffice since the introduction of the new tooltip lib. */
- 'js/hovertip.js',
- ];
const DEFAULT_PAGE_TEMPLATE_REL_PATH = 'pages/backoffice/nicewebpage/layout';
@@ -180,7 +175,7 @@ JS
{
$this->m_sRootUrl = $sRootUrl;
}
-
+
public function small_p($sText)
{
$this->add("
$sText
\n");
@@ -206,7 +201,7 @@ JS
public function MakeClassesSelect($sName, $sDefaultValue, $iWidthPx, $iActionCode = null)
{
// $aTopLevelClasses = array('bizService', 'bizContact', 'logInfra', 'bizDocument');
- // These are classes wich root class is cmdbAbstractObject !
+ // These are classes wich root class is cmdbAbstractObject !
$this->add("");
}
diff --git a/sources/Application/WebPage/TabManager.php b/sources/Application/WebPage/TabManager.php
index 39d8e70f1..f6b71e5c8 100644
--- a/sources/Application/WebPage/TabManager.php
+++ b/sources/Application/WebPage/TabManager.php
@@ -79,34 +79,6 @@ class TabManager
$oTab->AddSubBlock($oBlock);
}
- /**
- * @return int
- * @deprecated 3.0.0
- */
- public function GetCurrentTabLength()
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
-
- return 0;
- }
-
- /**
- * Truncates the given tab to the specifed length and returns the truncated part
- *
- * @param string $sTabContainer The tab container in which to truncate the tab
- * @param string $sTab The name/identifier of the tab to truncate
- * @param integer $iLength The length/offset at which to truncate the tab
- *
- * @return string The truncated part
- * @deprecated 3.0.0
- */
- public function TruncateTab(string $sTabContainer, string $sTab, int $iLength)
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
-
- return '';
- }
-
/**
* @param string $sTabContainer
* @param string $sTab
@@ -290,39 +262,6 @@ class TabManager
return $result;
}
- /**
- * Make the given tab the active one, as if it were clicked
- * DOES NOT WORK: apparently in the *old* version of jquery
- * that we are using this is not supported... TO DO upgrade
- * the whole jquery bundle...
- *
- * @param string $sTabContainer
- * @param string $sTabCode
- *
- * @return string
- * @deprecated 3.0.0
- */
- public function SelectTab(string $sTabContainer, string $sTabCode)
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
-
- return '';
- }
-
- /**
- * @param string $sContent
- * @param WebPage $oPage
- *
- * @return mixed
- * @deprecated 3.0.0
- */
- public function RenderIntoContent(string $sContent, WebPage $oPage)
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
-
- return '';
- }
-
/**
* @param string $sTabContainer
* @param string $sTabCode
diff --git a/sources/Application/WebPage/WebPage.php b/sources/Application/WebPage/WebPage.php
index 6c0b6d389..b37da9666 100644
--- a/sources/Application/WebPage/WebPage.php
+++ b/sources/Application/WebPage/WebPage.php
@@ -1641,19 +1641,6 @@ JS;
}
}
- /**
- * Get an ID (for any kind of HTML tag) that is guaranteed unique in this page
- *
- * @return int The unique ID (in this page)
- * @deprecated 3.0.0 use utils::GetUniqueId() instead
- */
- public function GetUniqueId()
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use utils::GetUniqueId() instead');
-
- return utils::GetUniqueId();
- }
-
/**
* Set the content-type (mime type) for the page's content
*
diff --git a/sources/Application/WebPage/iTopWebPage.php b/sources/Application/WebPage/iTopWebPage.php
index c862d6338..bb4ee6050 100644
--- a/sources/Application/WebPage/iTopWebPage.php
+++ b/sources/Application/WebPage/iTopWebPage.php
@@ -197,7 +197,7 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage
// Tooltips
$this->LinkScriptFromAppRoot('node_modules/@popperjs/core/dist/umd/popper.min.js');
$this->LinkScriptFromAppRoot('node_modules/tippy.js/dist/tippy-bundle.umd.min.js');
-
+
// Toasts
$this->LinkScriptFromAppRoot('node_modules/toastify-js/src/toastify.js');
@@ -1028,23 +1028,6 @@ HTML;
return $this->m_oTabs->FindTab($sPattern, $sTabContainer);
}
- /**
- * Make the given tab the active one, as if it were clicked
- * DOES NOT WORK: apparently in the *old* version of jquery
- * that we are using this is not supported... TO DO upgrade
- * the whole jquery bundle...
- *
- * @param string $sTabContainer
- * @param string $sTabCode
- *
- * @deprecated 3.0.0
- */
- public function SelectTab($sTabContainer, $sTabCode)
- {
- DeprecatedCallsLog::NotifyDeprecatedPhpMethod();
- $this->add_ready_script($this->m_oTabs->SelectTab($sTabContainer, $sTabCode));
- }
-
/**
* @inheritDoc
* @throws \Exception