Commit eb559d4c authored by Fabien Potencier's avatar Fabien Potencier

feature #1605 Add support for Symfony 4.0 (fabpot)

This PR was merged into the 2.3.x-dev branch.

Discussion
----------

Add support for Symfony 4.0

Commits
-------

7c6a06a9 added support for Symfony 4.0
parents bf03ec6b 7c6a06a9
...@@ -32,6 +32,12 @@ before_install: ...@@ -32,6 +32,12 @@ before_install:
sed -i 's/~2\.8|^3\.0/3.4.*/g' composer.json; sed -i 's/~2\.8|^3\.0/3.4.*/g' composer.json;
composer require --no-update symfony/web-link:3.4.* composer require --no-update symfony/web-link:3.4.*
fi fi
# Symfony 4.0
- |
if [[ $SYMFONY_DEPS_VERSION = 4.0 ]]; then
sed -i 's/~2\.8|^3\.0/4.0.*/g' composer.json;
composer require --no-update symfony/web-link:4.0.*
fi
- composer update --no-suggest - composer update --no-suggest
...@@ -51,6 +57,8 @@ matrix: ...@@ -51,6 +57,8 @@ matrix:
env: SYMFONY_DEPS_VERSION=3.3 env: SYMFONY_DEPS_VERSION=3.3
- php: 5.6 - php: 5.6
env: SYMFONY_DEPS_VERSION=3.4 env: SYMFONY_DEPS_VERSION=3.4
- php: 7.2
env: SYMFONY_DEPS_VERSION=4.0
- php: 5.6 - php: 5.6
- php: 7.0 - php: 7.0
- php: 7.1 - php: 7.1
......
...@@ -17,38 +17,38 @@ ...@@ -17,38 +17,38 @@
"require": { "require": {
"php": ">=5.5.9", "php": ">=5.5.9",
"pimple/pimple": "~3.0", "pimple/pimple": "~3.0",
"symfony/event-dispatcher": "~2.8|^3.0", "symfony/event-dispatcher": "~2.8|^3.4|^4.0",
"symfony/http-foundation": "~2.8|^3.0", "symfony/http-foundation": "~2.8|^3.4|^4.0",
"symfony/http-kernel": "~2.8|^3.0", "symfony/http-kernel": "~2.8|^3.4|^4.0",
"symfony/routing": "~2.8|^3.0" "symfony/routing": "~2.8|^3.4|^4.0"
}, },
"require-dev": { "require-dev": {
"symfony/asset": "~2.8|^3.0", "symfony/asset": "~2.8|^3.4|^4.0",
"symfony/expression-language": "~2.8|^3.0", "symfony/expression-language": "~2.8|^3.4|^4.0",
"symfony/security": "~2.8|^3.0", "symfony/security": "~2.8|^3.4|^4.0",
"symfony/config": "~2.8|^3.0", "symfony/config": "~2.8|^3.4|^4.0",
"symfony/form": "~2.8|^3.0", "symfony/form": "~2.8|^3.4|^4.0",
"symfony/browser-kit": "~2.8|^3.0", "symfony/browser-kit": "~2.8|^3.4|^4.0",
"symfony/css-selector": "~2.8|^3.0", "symfony/css-selector": "~2.8|^3.4|^4.0",
"symfony/debug": "~2.8|^3.0", "symfony/debug": "~2.8|^3.4|^4.0",
"symfony/dom-crawler": "~2.8|^3.0", "symfony/dom-crawler": "~2.8|^3.4|^4.0",
"symfony/finder": "~2.8|^3.0", "symfony/finder": "~2.8|^3.4|^4.0",
"symfony/intl": "~2.8|^3.0", "symfony/intl": "~2.8|^3.4|^4.0",
"symfony/monolog-bridge": "~2.8|^3.0", "symfony/monolog-bridge": "~2.8|^3.4|^4.0",
"symfony/doctrine-bridge": "~2.8|^3.0", "symfony/doctrine-bridge": "~2.8|^3.4|^4.0",
"symfony/options-resolver": "~2.8|^3.0", "symfony/options-resolver": "~2.8|^3.4|^4.0",
"symfony/phpunit-bridge": "^3.2", "symfony/phpunit-bridge": "^3.2",
"symfony/process": "~2.8|^3.0", "symfony/process": "~2.8|^3.4|^4.0",
"symfony/serializer": "~2.8|^3.0", "symfony/serializer": "~2.8|^3.4|^4.0",
"symfony/translation": "~2.8|^3.0", "symfony/translation": "~2.8|^3.4|^4.0",
"symfony/twig-bridge": "~2.8|^3.0", "symfony/twig-bridge": "~2.8|^3.4|^4.0",
"symfony/validator": "~2.8|^3.0", "symfony/validator": "~2.8|^3.4|^4.0",
"symfony/var-dumper": "~2.8|^3.0", "symfony/var-dumper": "~2.8|^3.4|^4.0",
"twig/twig": "~1.28|~2.0", "twig/twig": "~1.30|~2.0",
"doctrine/dbal": "~2.2", "doctrine/dbal": "~2.2",
"swiftmailer/swiftmailer": "~5", "swiftmailer/swiftmailer": "~5",
"monolog/monolog": "^1.4.1", "monolog/monolog": "^1.4.1",
"symfony/web-link": "^3.3" "symfony/web-link": "^3.4|^4.0"
}, },
"conflict": { "conflict": {
"phpunit/phpunit": "<4.8.35 || >= 5.0, <5.4.3" "phpunit/phpunit": "<4.8.35 || >= 5.0, <5.4.3"
......
...@@ -4,7 +4,7 @@ Changelog ...@@ -4,7 +4,7 @@ Changelog
2.3.0 (2018-XX-XX) 2.3.0 (2018-XX-XX)
------------------ ------------------
* n/a * added support for Symfony 4
2.2.3 (2018-02-25) 2.2.3 (2018-02-25)
------------------ ------------------
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.2.x-dev" "dev-master": "2.3.x-dev"
} }
} }
} }
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.2.x-dev" "dev-master": "2.3.x-dev"
} }
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment