2.4 do not serialize static properties #322

Closed
wants to merge 1 commit into
from

Conversation

Projects
None yet
7 participants

The master branch does not serialize static properties, 2.4 does.

When we upgraded to Doctrine ORM 2.4 the proxy generation was moved to Doctrine Common (I think) and subsequently all the proxy entities which has static properties caused errors on __sleep

Hello,

thank you for creating this pull request. However did not open it on the "master"
branch. Our Git workflow requires all pull requests to go through "master" branch
and the release masters then merge them back into stable branches, if they are
bug fixes.

Please open the pull request again for the "master" branch and close
this one.

Nevertheless I have opened a Jira ticket for this Pull Request to track this
issue:

http://www.doctrine-project.org/jira/browse/DCOM-242

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

This fix is already in master. //cc @Ocramius @beberlei

Owner

Ocramius commented May 21, 2014

This is something that needs to be merged back, not re-committed.

I'll probably merge master back into 2.4, as the diff isn't that large:

@Ocramius Ocramius closed this May 21, 2014

Koc commented May 21, 2014

@Ocramius why Doctrine uses uncommon workflow and all PR's should be shipped to master? Where can I read about it, does it better than Symfony's workflow?

Member

stof commented May 21, 2014

@Koc I don't think it is uncommon (PHP has the same workflow btw). It is just a different workflow than Symfony. Each has its pro and cons.
Given that several contributors have access to the repo to merge in the master branch, but only @beberlei pushes to maintenance branch for releases, this workflow fits better than the Symfony one.
On the other hand, the Symfony branching model makes it easier to ensure that a bugfix is applied everywhere.

Member

stof commented May 21, 2014

@Ocramius you should not merge master into 2.4 but cherry-pick the commits. Otherwise, it will duplicate the commits already applied in 2.4 in the history

Owner

Ocramius commented May 21, 2014

@stof yeah, I'll be sure to not mess up the commit graph

@Ocramius why Doctrine uses uncommon workflow and all PR's should be shipped to master?

Forward-porting pull requests and dealing with PRs that shouldn't be sent to release branches is a bit problematic (especially if we need to tell people that we won't merge their pull request because <reasons/>). Having everything in master and then backported into release branches gives us much better stability, as it is up to us to decide what is actually a breakage or not.

@Ocramius When do you think you can cherry pick the commit into the 2.4 branch please ? it's kinda blocking for us.

Thanks.

Koc commented May 21, 2014

@stof thank you for explanation. What to do, if master branch hasn't code that should be patched (it was deleted during refactoring)?

Member

stof commented May 21, 2014

well, this is the only case where it is valid to send a PR to an older branch (the latest branch having the code)

Could this be reopened then?

Owner

Ocramius commented May 21, 2014

The issue is open in jira - I'm gonna tackle it asap.

Cool, this is the original jira item that was closed by accident I think:

http://www.doctrine-project.org/jira/browse/DCOM-213

Owner

Ocramius commented May 21, 2014

Released.

good news. Thanks.

Thanks!

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