diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 3c8d9e2bec..6daccf162b 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -4568,6 +4568,9 @@ HTML; InlineImage::FinalizeInlineImages($this); } + /** + * @deprecated 3.1.1 3.2.0 N°6966 We will have only one DBClone method in the future + */ protected function DBCloneTracked_Internal($newKey = null) { /** @var cmdbAbstractObject $oNewObj */ @@ -4656,7 +4659,10 @@ HTML; return $oDeletionPlan; } - protected function DBDeleteTracked_Internal(&$oDeletionPlan = null) + /** + * @deprecated 3.1.1 3.2.0 N°6967 We will have only one DBDelete method in the future + */ + protected function DBDeleteTracked_Internal(&$oDeletionPlan = null) { // Invoke extensions before the deletion (the deletion will do some cleanup and we might loose some information /** @var \iApplicationObjectExtension $oExtensionInstance */ diff --git a/core/cmdbobject.class.inc.php b/core/cmdbobject.class.inc.php index 99f5e1184d..b9df6d05f3 100644 --- a/core/cmdbobject.class.inc.php +++ b/core/cmdbobject.class.inc.php @@ -438,7 +438,8 @@ abstract class CMDBObject extends DBObject } /** - * @deprecated 3.1.0 N°5232 not used + * @deprecated 3.1.0 N°5232 N°6966 simply use {@see DBObject::DBClone()} instead, that will automatically create and persist a CMDBChange object. + * If you need to persist your own, call {@see CMDBObject::SetCurrentChange()} before. */ public function DBCloneTracked(CMDBChange $oChange, $newKey = null) { @@ -446,6 +447,9 @@ abstract class CMDBObject extends DBObject $this->DBCloneTracked_Internal($newKey); } + /** + * @deprecated 3.1.1 3.2.0 N°6966 We will have only one DBClone method in the future + */ protected function DBCloneTracked_Internal($newKey = null) { $newKey = parent::DBClone($newKey); @@ -476,17 +480,7 @@ abstract class CMDBObject extends DBObject } /** - * @param null $oDeletionPlan - * - * @return \DeletionPlan|null - * @throws \ArchivedObjectException - * @throws \CoreCannotSaveObjectException - * @throws \CoreException - * @throws \CoreUnexpectedValue - * @throws \DeleteException - * @throws \MySQLException - * @throws \MySQLHasGoneAwayException - * @throws \OQLException + * @deprecated 3.1.1 3.2.0 N°6967 We will have only one DBDelete method in the future */ protected function DBDeleteTracked_Internal(&$oDeletionPlan = null) {