Skip to content

Fixed exception message when an annotation does not provide any properties#167

Merged
Ocramius merged 1 commit intodoctrine:masterfrom
lyrixx:typo
Nov 13, 2019
Merged

Fixed exception message when an annotation does not provide any properties#167
Ocramius merged 1 commit intodoctrine:masterfrom
lyrixx:typo

Conversation

@lyrixx
Copy link
Copy Markdown

@lyrixx lyrixx commented Dec 27, 2017

No description provided.

Comment thread lib/Doctrine/Common/Annotations/DocParser.php Outdated
Comment thread lib/Doctrine/Common/Annotations/DocParser.php Outdated
ammarfaizi2
ammarfaizi2 previously approved these changes Nov 7, 2018
@alcaeus alcaeus requested a review from Ocramius November 7, 2018 09:10
@alcaeus alcaeus assigned Ocramius and unassigned lyrixx Nov 7, 2018
@alcaeus
Copy link
Copy Markdown
Member

alcaeus commented Nov 7, 2018

@lyrixx sorry for the delay here - I've pinged @Ocramius for another review. In the meantime, could I ask you to rebase your PR?

@lyrixx
Copy link
Copy Markdown
Author

lyrixx commented Nov 7, 2018

I have rebased this PR

alcaeus
alcaeus previously approved these changes Nov 8, 2018
@lyrixx
Copy link
Copy Markdown
Author

lyrixx commented Mar 12, 2019

Could we merge this PR because another conflict?
Thanks

@SenseException
Copy link
Copy Markdown
Member

@alcaeus Anything we need here before this can be merged?

@lyrixx We need probably another rebase to the latest changes.

@lyrixx
Copy link
Copy Markdown
Author

lyrixx commented Jun 21, 2019

I'm sorry, but I don't understand what is wrong here. I keep rebase my PR but it's never merged.

@Ocramius Can you me help us to move on?

Comment thread tests/Doctrine/Tests/Annotations/DocParserTest.php Outdated
Comment thread tests/Doctrine/Tests/Annotations/DocParserTest.php Outdated
Comment thread tests/Doctrine/Tests/Annotations/DocParserTest.php Outdated
@lyrixx
Copy link
Copy Markdown
Author

lyrixx commented Jun 28, 2019

Should be OK

@lyrixx
Copy link
Copy Markdown
Author

lyrixx commented Jul 26, 2019

hello @Ocramius @guilhermeblanco
What is missing?

@lyrixx
Copy link
Copy Markdown
Author

lyrixx commented Nov 13, 2019

The diff is easier to read with ?=1

I think it's an easy pick

@Ocramius Ocramius added this to the v2.0.0 milestone Nov 13, 2019
@Ocramius Ocramius merged commit 2157e34 into doctrine:master Nov 13, 2019
@lyrixx lyrixx deleted the typo branch November 13, 2019 10:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants