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

Manual merge 3.x into 4.x #689

Merged
merged 6 commits into from Oct 17, 2021
Merged

Manual merge 3.x into 4.x #689

merged 6 commits into from Oct 17, 2021

Conversation

franmomu
Copy link
Member

No description provided.

@franmomu
Copy link
Member Author

blocked by PHP-CS-Fixer/PHP-CS-Fixer#6063

@jordisala1991
Copy link
Member

blocked by FriendsOfPHP/PHP-CS-Fixer#6063

there is not any easy fix until that gets merged and released?

@franmomu
Copy link
Member Author

blocked by FriendsOfPHP/PHP-CS-Fixer#6063

there is not any easy fix until that gets merged and released?

Yep, there was no need of the intersection type

@franmomu franmomu merged commit 759902e into sonata-project:4.x Oct 17, 2021
@franmomu franmomu deleted the 4.x branch October 17, 2021 20:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants