diff --git a/core/cmdbobject.class.inc.php b/core/cmdbobject.class.inc.php index 76525316f..dbdab2d58 100644 --- a/core/cmdbobject.class.inc.php +++ b/core/cmdbobject.class.inc.php @@ -513,83 +513,6 @@ abstract class CMDBObject extends DBObject } } - /** - * @deprecated 2.7.0 N°2361 simply use {@link DBInsert} instead, that will automatically create and persist a CMDBChange object. - * If you need to persist your own, call {@link CMDBObject::SetCurrentChange} before. - * - * @param \CMDBChange $oChange - * @param null $bSkipStrongSecurity - * - * @return int|null - * @throws \ArchivedObjectException - * @throws \CoreCannotSaveObjectException - * @throws \CoreException - * @throws \CoreUnexpectedValue - * @throws \CoreWarning - * @throws \MySQLException - * @throws \OQLException - * @throws \SecurityException - */ - public function DBInsertTracked(CMDBChange $oChange, $bSkipStrongSecurity = null) - { - self::SetCurrentChange($oChange); - $this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY); - $ret = $this->DBInsertTracked_Internal(); - return $ret; - } - - /** - * @deprecated 2.7.0 N°2361 simply use {@link DBInsertNoReload} instead, that will automatically create and persist a CMDBChange object. - * If you need to persist your own, call {@link CMDBObject::SetCurrentChange} before. - * - * @param \CMDBChange $oChange - * @param null $bSkipStrongSecurity - * - * @return int - * @throws \ArchivedObjectException - * @throws \CoreCannotSaveObjectException - * @throws \CoreException - * @throws \CoreUnexpectedValue - * @throws \CoreWarning - * @throws \MySQLException - * @throws \OQLException - * @throws \SecurityException - */ - public function DBInsertTrackedNoReload(CMDBChange $oChange, $bSkipStrongSecurity = null) - { - self::SetCurrentChange($oChange); - $this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY); - $ret = $this->DBInsertTracked_Internal(true); - return $ret; - } - - /** - * @deprecated 2.7.0 N°2361 simply use {@link DBInsert} or {@link DBInsertNoReload} instead - * - * @param bool $bDoNotReload - * - * @return integer Identifier of the created object - * @throws \ArchivedObjectException - * @throws \CoreCannotSaveObjectException - * @throws \CoreException - * @throws \CoreUnexpectedValue - * @throws \CoreWarning - * @throws \MySQLException - * @throws \OQLException - */ - protected function DBInsertTracked_Internal($bDoNotReload = false) - { - if ($bDoNotReload) - { - $ret = $this->DBInsertNoReload(); - } - else - { - $ret = $this->DBInsert(); - } - return $ret; - } - public function DBClone($newKey = null) { return $this->DBCloneTracked_Internal(); @@ -622,24 +545,6 @@ abstract class CMDBObject extends DBObject return $ret; } - /** - * @deprecated 2.7.0 N°2361 simply use {@link DBUpdate} instead, that will automatically create and persist a CMDBChange object. - * If you need to persist your own, call {@link CMDBObject::SetCurrentChange} before. - * - * @param \CMDBChange $oChange - * @param null $bSkipStrongSecurity - * - * @return int|void - * @throws \CoreCannotSaveObjectException - * @throws \CoreException - * @throws \SecurityException - */ - public function DBUpdateTracked(CMDBChange $oChange, $bSkipStrongSecurity = null) - { - self::SetCurrentChange($oChange); - $this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY); - $this->DBUpdate(); - } /** * @param null $oDeletionPlan @@ -659,31 +564,6 @@ abstract class CMDBObject extends DBObject return $this->DBDeleteTracked_Internal($oDeletionPlan); } - /** - * @deprecated 2.7.0 N°2361 simply use {@link DBDelete} instead, that will automatically create and persist a CMDBChange object. - * If you need to persist your own, call {@link CMDBObject::SetCurrentChange} before. - * - * @param \CMDBChange $oChange - * @param null $bSkipStrongSecurity - * @param null $oDeletionPlan - * - * @throws \ArchivedObjectException - * @throws \CoreCannotSaveObjectException - * @throws \CoreException - * @throws \CoreUnexpectedValue - * @throws \DeleteException - * @throws \MySQLException - * @throws \MySQLHasGoneAwayException - * @throws \OQLException - * @throws \SecurityException - */ - public function DBDeleteTracked(CMDBChange $oChange, $bSkipStrongSecurity = null, &$oDeletionPlan = null) - { - self::SetCurrentChange($oChange); - $this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_DELETE); - $this->DBDeleteTracked_Internal($oDeletionPlan); - } - /** * @param null $oDeletionPlan * diff --git a/core/dbobject.class.php b/core/dbobject.class.php index 3e5a5904d..436aed85d 100644 --- a/core/dbobject.class.php +++ b/core/dbobject.class.php @@ -2947,46 +2947,6 @@ abstract class DBObject implements iDisplay return $this->m_iKey; } - /** - * @internal - * - * @deprecated 2.7.0 N°2361 simply use {@see DBObject::DBInsert()} instead, that will automatically create and persist a CMDBChange object. - * If you need to persist your own, call {@see CMDBObject::SetCurrentChange()} before. - * - * @param CMDBChange $oChange - * - * @return int|null - * @throws CoreException - */ - public function DBInsertTracked(CMDBChange $oChange) - { - CMDBObject::SetCurrentChange($oChange); - return $this->DBInsert(); - } - - /** - * @internal - * - * @deprecated 2.7.0 N°2361 simply use {@see DBObject::DBInsertNoReload()} instead, that will automatically create and persist a CMDBChange object. - * If you need to persist your own, call {@see CMDBObject::SetCurrentChange()} before. - * - * @param CMDBChange $oChange - * - * @return int - * @throws ArchivedObjectException - * @throws CoreCannotSaveObjectException - * @throws CoreException - * @throws CoreUnexpectedValue - * @throws CoreWarning - * @throws MySQLException - * @throws OQLException - */ - public function DBInsertTrackedNoReload(CMDBChange $oChange) - { - CMDBObject::SetCurrentChange($oChange); - return $this->DBInsertNoReload(); - } - /** * Creates a copy of the current object into the database * @@ -3338,25 +3298,6 @@ abstract class DBObject implements iDisplay $this->m_aPreviousValuesForUpdatedAttributes = $aPreviousValuesForUpdatedAttributes; } - /** - * - * @internal - * - * @deprecated 2.7.0 N°2361 simply use {@see DBObject::DBUpdate()} instead, that will automatically create and persist a CMDBChange object. - * If you need to persist your own, call {@see CMDBObject::SetCurrentChange()} before. - * - * @param CMDBChange $oChange - * - * @return int - * @throws CoreCannotSaveObjectException - * @throws CoreException - */ - public function DBUpdateTracked(CMDBChange $oChange) - { - CMDBObject::SetCurrentChange($oChange); - return $this->DBUpdate(); - } - /** * Make the current changes persistent - clever wrapper for Insert or Update * @@ -3611,32 +3552,7 @@ abstract class DBObject implements iDisplay return $oDeletionPlan; } - /** - * @internal - * - * @deprecated 2.7.0 N°2361 simply use {@see DBObject::DBDelete()} instead. - * If you need to persist your own, call {@see CMDBObject::SetCurrentChange()} before. - * - * @param CMDBChange $oChange - * @param boolean $bSkipStrongSecurity - * @param \DeletionPlan $oDeletionPlan - * - * @throws ArchivedObjectException - * @throws CoreCannotSaveObjectException - * @throws CoreException - * @throws CoreUnexpectedValue - * @throws DeleteException - * @throws MySQLException - * @throws MySQLHasGoneAwayException - * @throws OQLException - */ - public function DBDeleteTracked(CMDBChange $oChange, $bSkipStrongSecurity = null, &$oDeletionPlan = null) - { - CMDBObject::SetCurrentChange($oChange); - $this->DBDelete($oDeletionPlan); - } - - /** + /** * @internal * * @return array