Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge release 2.0.3 into master #2126

Merged
merged 4 commits into from
Nov 26, 2019
Merged

Merge release 2.0.3 into master #2126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1463a78
Remove unneceesary internal designations
alcaeus Nov 25, 2019
3bfedc0
Merge pull request #2123 from alcaeus/remove-useless-internal
malarzm Nov 25, 2019
c8b27c1
Merge remote-tracking branch 'upstream/1.3.x' into 1.3.x-merge-up-int…
alcaeus Nov 26, 2019
72ca04d
Merge pull request #2125 from doctrine/1.3.x-merge-up-into-2.0.x_5ddc…
alcaeus Nov 26, 2019
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
2 changes: 0 additions & 2 deletions lib/Doctrine/ODM/MongoDB/DocumentManager.php
View file
Open in desktop
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
3 changes: 0 additions & 3 deletions lib/Doctrine/ODM/MongoDB/PersistentCollection/PersistentCollectionTrait.php
View file
Open in desktop
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
View file
Open in desktop
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