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

Removed oauthAccounts since it is already defined in user bundle #3402

Merged
merged 1 commit into from
Nov 20, 2015

Conversation

umpirsky
Copy link
Contributor

@umpirsky umpirsky commented Oct 7, 2015

I was getting:

MappingException: Property "oauthAccounts" in "Sylius\Component\Core\Model\User" was already declared, but it must be declared only once

Does not belong to this model, already defined in User.orm.xml#L55.

Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
License MIT

@umpirsky
Copy link
Contributor Author

umpirsky commented Oct 7, 2015

@pjedrzejewski @michalmarcinkowski Can this fix be added to 0.15? It is critical for us. Maybe releasing v0.15.1 with this fix?

@michalmarcinkowski
Copy link
Contributor

I think we could release v0.15.1 with this fix, @pjedrzejewski?

@stloyd
Copy link
Contributor

stloyd commented Oct 7, 2015

I don't think that this is possible as the approach is broken and semver is not fully followed.

167 commits to master since this release (0.15.0)

So there are too many BC breaks (including bump of PHP version)...

@umpirsky
Copy link
Contributor Author

umpirsky commented Oct 7, 2015

Then maybe just apply this fix on 0.15.0 and release 0.15.1? Would that be possible?

@michalmarcinkowski
Copy link
Contributor

Exactly, we could simply revert to v0.15.0 cherry-pick the @umpirsky commit with this fix and release v0.15.1. Then rebase master with v0.15.1 and everything should be fine. Would that be possible @pjedrzejewski?

@umpirsky
Copy link
Contributor Author

umpirsky commented Oct 7, 2015

@michalmarcinkowski That was what I was hoping for exactly. :)

@umpirsky
Copy link
Contributor Author

This is also missing in 0.15 .

@umpirsky
Copy link
Contributor Author

#3427 also made upgrade to 0.15 hard. We needed to override Sylius\Bundle\CoreBundle\Form\Type\Checkout\ShipmentType.

@michalmarcinkowski michalmarcinkowski added Bug Fix Critical Issues and PRs, which are critical and should be fixed ASAP. labels Oct 18, 2015
@pjedrzejewski
Copy link
Member

@umpirsky I will setup 0.15.x branch tomorrow and ping you here to reopen this fix against this branch. 👍

@stloyd
Copy link
Contributor

stloyd commented Nov 20, 2015

@pjedrzejewski ping

pjedrzejewski pushed a commit that referenced this pull request Nov 20, 2015
Removed oauthAccounts since it is already defined in user bundle
@pjedrzejewski pjedrzejewski merged commit 81f017f into Sylius:master Nov 20, 2015
@pjedrzejewski
Copy link
Member

Thanks Sasha!

@umpirsky umpirsky deleted the fix/duplicated-oauth-accounts branch November 20, 2015 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Critical Issues and PRs, which are critical and should be fixed ASAP.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants