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.

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

Update Upgrade.md after minor bc break in 2.5.0 #1529

Merged
merged 2 commits into from
Nov 9, 2015

Conversation

tkleinhakisa
Copy link
Contributor

The introduction of the second parameter in EntityRepository#createQueryBuilder generates a runtime notice if you have a sub-class of EntityRepository that has a second parameter in the createQueryBuilder method

The parameter was introduced in b0513a7

@doctrinebot
Copy link

Hello,

thank you for creating this pull request. I have automatically opened an issue
on our Jira Bug Tracker for you. See the issue link:

http://www.doctrine-project.org/jira/browse/DDC-3938

We use Jira to track the state of pull requests and the versions they got
included in.

@Ocramius
Copy link
Member

Ocramius commented Oct 6, 2015

@tkleinhakisa I think the BC break should be reverted, and we should use func_get_args() for the 2.5.x series, while we keep the current code for 2.6.x

@tkleinhakisa
Copy link
Contributor Author

@Ocramius I thiink i made a mistake and the break was introduced in 2.5.0 not 2.5.1

In this case the param should be kept and the upgrade 2.5 updated, is that right ?

@Ocramius
Copy link
Member

Ocramius commented Oct 8, 2015

@tkleinhakisa if the BC break happened from 2.4.x -> 2.5.0 then this patch is correct, and no reverting is needed.

@@ -1,3 +1,9 @@
# Upgrade to 2.5.1
Copy link
Member

Choose a reason for hiding this comment

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

Move to the 2.5 block

The introduction of the second parameter in EntityRepository#createQueryBuilder generates a runtime notice if you have a sub-class of EntityRepository that has a second parameter in the createQueryBuilder method
@tkleinhakisa tkleinhakisa changed the title Update Upgrade.md after minor bc break in 2.5.1 Update Upgrade.md after minor bc break in 2.5.0 Oct 9, 2015
@tkleinhakisa
Copy link
Contributor Author

Fixed and rebased

guilhermeblanco added a commit that referenced this pull request Nov 9, 2015
Update Upgrade.md after minor bc break in 2.5.0
@guilhermeblanco guilhermeblanco merged commit 1187c51 into doctrine:master Nov 9, 2015
@guilhermeblanco
Copy link
Member

Thanks for the PR!

This is now merged in 2.5 and master branches.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants