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

Default to real-utf8 when no charset is provided #1077

Merged
merged 1 commit into from Nov 28, 2019

Conversation

alcaeus
Copy link
Member

@alcaeus alcaeus commented Nov 28, 2019

This is a back port of #1070 since that was inadvertently merged to master only.

@alcaeus alcaeus added the Bug label Nov 28, 2019
@alcaeus alcaeus added this to the 2.0.2 milestone Nov 28, 2019
@alcaeus alcaeus self-assigned this Nov 28, 2019
@alcaeus alcaeus added Improvement and removed Bug labels Nov 28, 2019
Copy link
Member

@greg0ire greg0ire left a comment

Choose a reason for hiding this comment

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

Let's change the default branch if it's wrong? (on my phone, hard to check)

@alcaeus
Copy link
Member Author

alcaeus commented Nov 28, 2019

Let's change the default branch if it's wrong? (on my phone, hard to check)

No, this was just a case of @nicolas-grekas and I not realising that the bug should be fixed in 2.0.1. New features should still go to master, so I don't think changing the default branch is a smart idea.

@alcaeus alcaeus merged commit f96fac2 into doctrine:2.0.x Nov 28, 2019
@alcaeus alcaeus deleted the backport-charset-fix branch November 28, 2019 08:38
@greg0ire
Copy link
Member

I didn't realise master was aliased to 2 and not 3. Not a smart idea indeed. Not sure why it's not like in ORM or DBAL though. Also, I see that the alias is 2.0, it should probably be 2.1, right?

@alcaeus
Copy link
Member Author

alcaeus commented Nov 28, 2019

I haven't updated the alias yet. The alias will change to 3.0 once we start working on 3.0. Until then, it can stay at 2.x (pointing to the next minor release): we're not merging PRs with BC breaks.

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.

None yet

3 participants