Skip to content

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

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

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

Conversation

@lyrixx

@lyrixx lyrixx commented Dec 27, 2017

Copy link
Copy Markdown

No description provided.

Ocramius
Ocramius suggested changes Dec 27, 2017
View reviewed changes
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
View reviewed changes
@alcaeus alcaeus requested a review from Ocramius November 7, 2018 09:10
@alcaeus alcaeus assigned Ocramius and unassigned lyrixx Nov 7, 2018
@alcaeus

alcaeus commented Nov 7, 2018

Copy link
Copy Markdown
Member

@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

lyrixx commented Nov 7, 2018

Copy link
Copy Markdown
Author

I have rebased this PR

alcaeus
alcaeus previously approved these changes Nov 8, 2018
View reviewed changes
@lyrixx

lyrixx commented Mar 12, 2019

Copy link
Copy Markdown
Author

Could we merge this PR because another conflict?
Thanks

@SenseException

SenseException commented Mar 12, 2019

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

lyrixx commented Jun 21, 2019

Copy link
Copy Markdown
Author

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?

greg0ire
greg0ire reviewed Jun 21, 2019
View reviewed changes
Comment thread tests/Doctrine/Tests/Annotations/DocParserTest.php Outdated
greg0ire
greg0ire reviewed Jun 21, 2019
View reviewed changes
Comment thread tests/Doctrine/Tests/Annotations/DocParserTest.php Outdated
guilhermeblanco
guilhermeblanco reviewed Jun 23, 2019
View reviewed changes
Comment thread tests/Doctrine/Tests/Annotations/DocParserTest.php Outdated
@lyrixx

lyrixx commented Jun 28, 2019

Copy link
Copy Markdown
Author

Should be OK

@lyrixx

lyrixx commented Jul 26, 2019

Copy link
Copy Markdown
Author

hello @Ocramius @guilhermeblanco
What is missing?

@lyrixx

lyrixx commented Nov 13, 2019

Copy link
Copy Markdown
Author

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

Reviewers

@greg0ire greg0ire greg0ire approved these changes
@alcaeus alcaeus alcaeus left review comments
+3 more reviewers
@guilhermeblanco guilhermeblanco guilhermeblanco left review comments
@Ocramius Ocramius Ocramius approved these changes
@ammarfaizi2 ammarfaizi2 ammarfaizi2 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@Ocramius Ocramius

Labels

enhancement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@lyrixx @alcaeus @SenseException @Ocramius @guilhermeblanco @greg0ire @ammarfaizi2