[Common 2.4+] DCOM-96 compliance as of doctrine/common#168 #506

Closed
wants to merge 1 commit into from

3 participants

@Ocramius
Doctrine member

Followup for #445 (branch was messed up) (needs "doctrine/common": "2.4" to work, so the build won't pass for now)

@jmikola jmikola and 1 other commented on an outdated diff Feb 19, 2013
lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataInfo.php
*
- * @param object $document
- * @return array
+ * Since MongoDB only allows exactly one identifier field this returns an array with the identifier field as a key.
@jmikola
Doctrine member
jmikola added a note Feb 19, 2013

Should this be line-wrapped like previous documentation?

@Ocramius
Doctrine member
Ocramius added a note Mar 4, 2013

@jmikola not sure what you mean here

@jmikola
Doctrine member
jmikola added a note Mar 4, 2013

Document lines tend to get wrapped for an 80-character column size.

@Ocramius
Doctrine member
Ocramius added a note Mar 4, 2013

@jmikola ah, I see :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@jmikola
Doctrine member

@Ocramius: I updated to doctrine/common 2.4 in master. Can you rebase this?

Feel free to ignore all of the docblock changes (ClassMetadataInfo had many of them). I prefer not to use {@inheritDoc} to pull in interface documentation, since it's ambiguous.

@jwage
Doctrine member

@Ocramius can you rebase this?

@jmikola
Doctrine member

@jwage: I talked about it with him in IRC some weeks ago and I believe the conclusion was that it'd probably be better off redone from scratch.

@Ocramius
Doctrine member

This was already merged/handled as it seems. GIT is only very very (VERY) confused about the diffs for some reason.

@Ocramius Ocramius closed this Feb 15, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment