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

Merge 3.x manually #349

Merged
merged 35 commits into from
Dec 22, 2016
Merged

Conversation

greg0ire
Copy link
Contributor

@greg0ire greg0ire commented Dec 18, 2016

I am targetting this branch, because this is a merge.

Refs sonata-project/dev-kit#221

Changelog

### Removed
- PHP 5.3 through 5.5 support was removed

soullivaneuh and others added 30 commits July 12, 2016 10:02
This should reduce conflicts, and make diffs easier to read.
…feature/blocks-bc

Revert "Deprecate BaseBlockService and BlockAdminServiceInterface"
…on_messages

Improve deprecation messages
@greg0ire
Copy link
Contributor Author

Hmmmm… it fails for php 5.5. Which shouldn't even be built. But I guess it is still built because dev-kit couldn't deploy because… other conflicts?

@greg0ire greg0ire added the major label Dec 18, 2016
@greg0ire
Copy link
Contributor Author

Let's try removing old php versions support manually then…

@greg0ire
Copy link
Contributor Author

ping @sonata-project/contributors

@OskarStark OskarStark merged commit b11c03e into sonata-project:master Dec 22, 2016
@greg0ire greg0ire deleted the merge_3.x_manually branch December 22, 2016 10:56
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.