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

Fix #761, #762: support nullable identifier hint in proxies #763

Merged
merged 9 commits into from
Jan 13, 2017
Merged

Fix #761, #762: support nullable identifier hint in proxies #763

merged 9 commits into from
Jan 13, 2017

Conversation

Ocramius
Copy link
Member

Fixes #761
Fixes #762
Replaces #762 (includes its commits)

@Ocramius Ocramius added the Bug label Jan 13, 2017
@Ocramius Ocramius added this to the 2.7.2 milestone Jan 13, 2017
@Ocramius Ocramius self-assigned this Jan 13, 2017
@Ocramius Ocramius mentioned this pull request Jan 13, 2017
Closed
soullivaneuh
soullivaneuh reviewed Jan 13, 2017
View reviewed changes
tests/Doctrine/Tests/Common/Proxy/LazyLoadableObjectWithNullableTypehints.php
return $this->identifierFieldReturnClassOneLetterNullable;
}

public function getIdentifierFieldReturnClassOneLetterNullableWithSpace(): ? A
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't know what is the correct syntax, but you set ? A here and ?A.

I suppose this is not wanted. 😉

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Space is intentional, since both approaches are valid/accepted

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh indeed.

But why do you have to test both syntaxes? The behavior is same, am I wrong?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but the code analyzer is regex-based (yeah, I know :S)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but the code analyzer is regex-based

Damn me, indeed!

(yeah, I know :S)

Regex is good, eat it! :trollface:

aurimasniekis
aurimasniekis approved these changes Jan 13, 2017
View reviewed changes
Copy link
Contributor

@aurimasniekis aurimasniekis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks ok

@Ocramius Ocramius merged commit 56fff71 into master Jan 13, 2017
@Ocramius Ocramius deleted the fix/#761-#762-support-nullable-identifier-hint-in-proxies branch January 13, 2017 13:55
Ocramius added a commit that referenced this pull request Jan 13, 2017
@Ocramius
Merge branch 'fix/#761-#762-support-nullable-identifier-hint-in-proxi…
9302970 
…es-2.7' into 2.7

Backport #761
Backport #762
Backport #763
@Ocramius
Copy link
Member Author

Backported into 2.7 in 9302970

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aurimasniekis aurimasniekis aurimasniekis approved these changes

@soullivaneuh soullivaneuh soullivaneuh approved these changes

Assignees

@Ocramius Ocramius

Labels
Bug
Projects
None yet
Milestone
2.7.2
Development

Successfully merging this pull request may close these issues.
3 participants
@Ocramius @aurimasniekis @soullivaneuh