composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 23:32:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleanup warnings

Browse Source
This commit is contained in:
Eric
2019-09-06 15:06:08 +02:00
parent 9c52f6b949
commit 20aa1bfdd6
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/metamodel.class.php
View File

@@ -934,7 +934,7 @@ abstract class MetaModel
* @param string $sClass Name of the class * @param string $sClass Name of the class
* @param string $sAttCode Code of the attributes * @param string $sAttCode Code of the attributes
* *
* @return Array List of attribute codes that depend on the given attribute, empty array if none. * @return array List of attribute codes that depend on the given attribute, empty array if none.
* @throws \CoreException * @throws \CoreException
* @throws \Exception * @throws \Exception
*/ */
@@ -1190,7 +1190,7 @@ abstract class MetaModel
/** /**
* array of ("classname" => array of attributes) * array of ("classname" => array of attributes)
* *
* @var \AttributeDefinition[] * @var \AttributeDefinition[][]
*/ */
private static $m_aAttribDefs = array(); private static $m_aAttribDefs = array();
/** /**
@@ -2200,10 +2200,10 @@ abstract class MetaModel
} }
} }
} }
else //else
{ //{
// Cannot take the legacy system into account... simply ignore it // Cannot take the legacy system into account... simply ignore it
} //}
} // foreach class } // foreach class
// Perform the up/down reconciliation for the legacy definitions // Perform the up/down reconciliation for the legacy definitions
@@ -4382,8 +4382,7 @@ abstract class MetaModel
{ {
$iChildId = $aValues['id']; $iChildId = $aValues['id'];
$iLeft = $iCurrIndex++; $iLeft = $iCurrIndex++;
//FIXME calling ourselves but no return statement in this method ?!!??? self::HKInitChildren($sTable, $sAttCode, $oAttDef, $iChildId, $iCurrIndex);
$aChildren = self::HKInitChildren($sTable, $sAttCode, $oAttDef, $iChildId, $iCurrIndex);
$iRight = $iCurrIndex++; $iRight = $iCurrIndex++;
$sSQL = "UPDATE `$sTable` SET `$sLeft` = $iLeft, `$sRight` = $iRight WHERE id= $iChildId"; $sSQL = "UPDATE `$sTable` SET `$sLeft` = $iLeft, `$sRight` = $iRight WHERE id= $iChildId";
CMDBSource::Query($sSQL); CMDBSource::Query($sSQL);
@@ -5848,10 +5847,10 @@ abstract class MetaModel
{ {
$sAction = $aErrorsAndFixes[$sRootClass][$sTable][$iRecordId]['Action']; $sAction = $aErrorsAndFixes[$sRootClass][$sTable][$iRecordId]['Action'];
if ($sAction == 'Delete') //if ($sAction == 'Delete')
{ //{
// No need to update, the record will be deleted! // No need to update, the record will be deleted!
} //}
if ($sAction == 'Update') if ($sAction == 'Update')
{ {
@@ -6686,7 +6685,7 @@ abstract class MetaModel
* @param bool $bAllowAllData if true then user rights will be bypassed - use with care! * @param bool $bAllowAllData if true then user rights will be bypassed - use with care!
* @param null $aModifierProperties * @param null $aModifierProperties
* *
* @return \cmdbAbstractObject null if : (the object is not found) or (archive mode disabled and object is archived and * @return \DBObject null if : (the object is not found) or (archive mode disabled and object is archived and
* $bMustBeFound=false) * $bMustBeFound=false)
* @throws CoreException if no result found and $bMustBeFound=true * @throws CoreException if no result found and $bMustBeFound=true
* @throws ArchivedObjectException if archive mode disabled and result is archived and $bMustBeFound=true * @throws ArchivedObjectException if archive mode disabled and result is archived and $bMustBeFound=true
@@ -6983,7 +6982,7 @@ abstract class MetaModel
* Surpasses BulkDelete as it can handle abstract classes, but has the other limitation as it bypasses standard * Surpasses BulkDelete as it can handle abstract classes, but has the other limitation as it bypasses standard
* objects handlers * objects handlers
* *
* @param string $oFilter Scope of objects to wipe out * @param \DBSearch $oFilter Scope of objects to wipe out
* *
* @return int The count of deleted objects * @return int The count of deleted objects
* @throws \CoreException * @throws \CoreException