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.

Sign up for GitHub

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

Jump to bottom

Add support for SonataBlockBundle 4.x #1023

Merged
merged 1 commit into from
Aug 19, 2020
Merged

Add support for SonataBlockBundle 4.x #1023

merged 1 commit into from
Aug 19, 2020

Conversation

wbloszyk
Copy link
Member

@wbloszyk wbloszyk commented Mar 31, 2020 •
edited
Loading

Subject

I am targeting this branch, because this change have to be in 3.x - see sonata-project/SonataAdminBundle#6212.

Changelog

### Added
- Add support for SonataBlockBundle 4.0

@wbloszyk wbloszyk closed this Mar 31, 2020
@wbloszyk wbloszyk reopened this Mar 31, 2020
@wbloszyk wbloszyk closed this Mar 31, 2020
@wbloszyk wbloszyk reopened this Mar 31, 2020
@wbloszyk wbloszyk mentioned this pull request Apr 1, 2020
Closed
@SonataCI
Copy link
Collaborator

SonataCI commented Jun 6, 2020

Could you please rebase your PR and fix merge conflicts?

@wbloszyk wbloszyk mentioned this pull request Jul 20, 2020
Merged
1 task
@jordisala1991
Copy link
Member

@wbloszyk try to follow same steps that the ones on my PR (modify construct) to have consistency here).

@wbloszyk wbloszyk marked this pull request as ready for review July 20, 2020 08:45
jordisala1991
jordisala1991 reviewed Jul 20, 2020
View reviewed changes
UPGRADE-3.x.md Outdated Show resolved Hide resolved
@wbloszyk wbloszyk force-pushed the block_4_support branch 2 times, most recently from 972404c to 0d1a037 Compare July 20, 2020 09:41
@wbloszyk wbloszyk requested a review from jordisala1991 July 20, 2020 09:50
@wbloszyk
Copy link
Member Author

RTM

@jordisala1991 jordisala1991 requested a review from a team July 20, 2020 10:06
@john-dufrene-dev
Copy link

@wbloszyk I need some explanation to understand this PR,

Bundle sonataAdminORMAdmin could now use v.3 or v.4 of SonataBlockBundle.
But sonataAdmin v.3 require for now v.3 of SonataBlockBundle, so its not possible to use v.4 of SonataBlockBundle in SonataAdmin v.3 and sonataDoctrineORMAdmin v.3,
I don't understand objective of this PR ?

Maybe me logic is Bad, could you explain me plz ?

@VincentLanglet
Copy link
Member

@john-dufrene-dev sonata-project/SonataAdminBundle#6212

@john-dufrene-dev
Copy link

@VincentLanglet ohhh okay didn't see my Bad thanks

jordisala1991
jordisala1991 previously approved these changes Jul 20, 2020
View reviewed changes
@jordisala1991
Copy link
Member

jordisala1991 commented Jul 20, 2020 •
edited
Loading

IMO the SonataAdminBundle PR should be merged first, because here we are not seeing the BlockBundle 4.0 installed yet: https://travis-ci.org/github/sonata-project/SonataDoctrineORMAdminBundle/jobs/709934612#L601

core23
core23 previously approved these changes Jul 21, 2020
View reviewed changes
@wbloszyk wbloszyk mentioned this pull request Jul 21, 2020
Closed
15 tasks
@SonataCI
Copy link
Collaborator

Could you please rebase your PR and fix merge conflicts?

@wbloszyk wbloszyk dismissed stale reviews from core23 and jordisala1991 via 232d5ab July 26, 2020 09:02
@wbloszyk wbloszyk requested review from core23 and jordisala1991 July 26, 2020 09:02
greg0ire
greg0ire reviewed Jul 27, 2020
View reviewed changes
UPGRADE-3.x.md Outdated Show resolved Hide resolved
@jordisala1991 jordisala1991 reopened this Aug 11, 2020
@wbloszyk wbloszyk force-pushed the block_4_support branch 2 times, most recently from d186b7f to 5a66b64 Compare August 19, 2020 08:27
VincentLanglet
VincentLanglet previously approved these changes Aug 19, 2020
View reviewed changes
greg0ire
greg0ire reviewed Aug 19, 2020
View reviewed changes
UPGRADE-3.x.md Outdated Show resolved Hide resolved
@wbloszyk @greg0ire
Add support for SonataBlockBundle 4.x
b4a30b3 
Update UPGRADE-3.x.md

Co-authored-by: Grégoire Paris <[email protected]>

Update UPGRADE-3.x.md

Co-authored-by: Grégoire Paris <[email protected]>
@greg0ire greg0ire merged commit effc539 into sonata-project:3.x Aug 19, 2020
@greg0ire
Copy link
Contributor

Thanks @wbloszyk !

@wbloszyk wbloszyk deleted the block_4_support branch August 19, 2020 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@greg0ire greg0ire greg0ire approved these changes

@core23 core23 Awaiting requested review from core23

@jordisala1991 jordisala1991 Awaiting requested review from jordisala1991

@VincentLanglet VincentLanglet Awaiting requested review from VincentLanglet

Assignees
No one assigned
Labels
minor
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@wbloszyk @SonataCI @jordisala1991 @john-dufrene-dev @VincentLanglet @greg0ire @core23