Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lib/Doctrine/Common/Persistence/ObjectManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ public function remove($object);
* of this ObjectManager and returns the managed copy of the object.
* The object passed to merge will not become associated/managed with this ObjectManager.
*
* @deprecated Merge operation is deprecated and will be removed in Persistence 2.0. Merging should be part of
* the business domain of an application rather than a generic operation of ObjectManager.
*
* @param object $object
*
* @return object
Expand All @@ -75,6 +78,9 @@ public function clear($objectName = null);
* Objects which previously referenced the detached object will continue to
* reference it.
*
* @deprecated Detach operation is deprecated and will be removed in Persistence 2.0. Please use
* {@see ObjectManager::clear()} instead.
*
* @param object $object The object to detach.
*
* @return void
Expand Down