-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Add doctrine/common 3 support #6127
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The CI suite is yet using doctrine/common:2.13.2
:
https://travis-ci.org/github/sonata-project/SonataAdminBundle/jobs/693376005#L605.
It looks like |
SonataBlock 3.19 released but doctrine common is still on 2.x, maybe there are more dependencies that block the install? @jaikdean |
It seems the dependency tree here is a little more complex than I'd realised and will need updates to some third-party packages. |
|
I'm allowing |
The symfony doctrine bridge already has support for this, can you rebase to fix phpstan? Maybe we can merge this now |
Well, now the build uses the doctrine common 3 and the build fails. Can you fix it @jaikdean ? |
0e7a703
to
5da8253
Compare
I've fixed the compatibility issues with |
Could you please rebase your PR and fix merge conflicts? |
@jaikdean the security acl is already fixed |
5da8253
to
0a1ebce
Compare
Thanks @jordisala1991. This branch has been rebased and conflicts resolved.
|
PHPStan is failing, are you sure you did a rebase with latest 3.x changes? |
ping @vladyslavstartsev any clues why it is failing? seems like the PR is rebased correctly. |
Looks like it's installing block-bundle |
Oh so we need first to add support for doctrine common 3 on sonata block 4? |
It already has support, but I have no idea why in this action is installing block bundle 3: And in the last commit merged is installing block bundle 4: |
Build is green and installing common 3, but before merge we need to know if those dependencies added are correct |
Could you please rebase your PR and fix merge conflicts? |
Fix support for doctrine/persistence 1.3 and 2.0 Remove unnecessary Doctrine dependencies
2aeafb8
a9df2a6
to
2aeafb8
Compare
Rebased and merge conflicts resolved. |
Thank you @jaikdean |
Subject
This PR adds support for
doctrine/common
3. It follows the upgrade instructions in Doctrine's release notes.I am targeting this branch, because the change is back-compatible.
Closes #6121.
Changelog