Skip to content

Commit

Permalink
Merge pull request #2125 from doctrine/1.3.x-merge-up-into-2.0.x_5ddc…
Browse files Browse the repository at this point in the history
…d836c41c12.43134100

Merge release 1.3.5 into 2.0.x
  • Loading branch information
alcaeus committed Nov 26, 2019
2 parents 9d4b3f0 + c8b27c1 commit 72ca04d
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 9 deletions.
2 changes: 0 additions & 2 deletions lib/Doctrine/ODM/MongoDB/DocumentManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,6 @@ public function getClassNameResolver() : ClassNameResolver
/**
* Returns the metadata for a class.
*
* @internal Performance-sensitive method.
*
* @param string $className The class name.
*/
public function getClassMetadata($className) : ClassMetadata
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -589,9 +589,6 @@ public function slice($offset, $length = null)
/**
* Called by PHP when this collection is serialized. Ensures that the
* internal state of the collection can be reproduced after serialization
*
* @internal Tried to implement Serializable first but that did not work well
* with circular references. This solution seems simpler and works well.
*/
public function __sleep()
{
Expand Down
4 changes: 0 additions & 4 deletions lib/Doctrine/ODM/MongoDB/UnitOfWork.php
Original file line number Diff line number Diff line change
Expand Up @@ -1891,8 +1891,6 @@ public function detach(object $document) : void

/**
* Executes a detach operation on the given document.
*
* @internal This method always considers documents with an assigned identifier as DETACHED.
*/
private function doDetach(object $document, array &$visited) : void
{
Expand Down Expand Up @@ -2531,8 +2529,6 @@ public function getClassNameForAssociation(array $mapping, $data) : string

/**
* Creates a document. Used for reconstitution of documents during hydration.
*
* @internal
*/
public function getOrCreateDocument(string $className, array $data, array &$hints = [], ?object $document = null) : object
{
Expand Down

0 comments on commit 72ca04d

Please sign in to comment.