Skip to content

Commit 72ca04d

Browse files
authored
Merge pull request #2125 from doctrine/1.3.x-merge-up-into-2.0.x_5ddcd836c41c12.43134100
Merge release 1.3.5 into 2.0.x
2 parents 9d4b3f0 + c8b27c1 commit 72ca04d

3 files changed

Lines changed: 0 additions & 9 deletions

File tree

lib/Doctrine/ODM/MongoDB/DocumentManager.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,6 @@ public function getClassNameResolver() : ClassNameResolver
277277
/**
278278
* Returns the metadata for a class.
279279
*
280-
* @internal Performance-sensitive method.
281-
*
282280
* @param string $className The class name.
283281
*/
284282
public function getClassMetadata($className) : ClassMetadata

lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionTrait.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -589,9 +589,6 @@ public function slice($offset, $length = null)
589589
/**
590590
* Called by PHP when this collection is serialized. Ensures that the
591591
* internal state of the collection can be reproduced after serialization
592-
*
593-
* @internal Tried to implement Serializable first but that did not work well
594-
* with circular references. This solution seems simpler and works well.
595592
*/
596593
public function __sleep()
597594
{

lib/Doctrine/ODM/MongoDB/UnitOfWork.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1891,8 +1891,6 @@ public function detach(object $document) : void
18911891

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

25322530
/**
25332531
* Creates a document. Used for reconstitution of documents during hydration.
2534-
*
2535-
* @internal
25362532
*/
25372533
public function getOrCreateDocument(string $className, array $data, array &$hints = [], ?object $document = null) : object
25382534
{

0 commit comments

Comments
 (0)