Commit ef73bf80 authored by Fabien Potencier's avatar Fabien Potencier

feature #1250 Added Symfony 3.0 in Travis (fabpot)

This PR was merged into the 1.3 branch.

Discussion
----------

Added Symfony 3.0 in Travis

Commits
-------

5aa17969 allowed Twig 2.0
dc97b3ab allowed Symfony 3.0
436aded5 simplifed composer.json
parents e312ea5e 5aa17969
...@@ -8,11 +8,12 @@ cache: ...@@ -8,11 +8,12 @@ cache:
before_script: before_script:
# symfony/* # symfony/*
- sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.8' ]; then sed -i 's/~2.3/2.8.*@dev/g' composer.json; composer update --dev --prefer-source; fi" - sh -c "if [ '$TWIG_VERSION' != '2.0' ]; then sed -i 's/~1.8|~2.0/~1.8/g' composer.json; composer update; fi"
- sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.7' ]; then sed -i 's/~2.3/2.7.*@dev/g' composer.json; composer update --dev --prefer-source; fi" - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '3.0' ]; then sed -i 's/~2\.3|3\.0\.\*/3.0.*@dev/g' composer.json; composer update; fi"
- sh -c "if [ '$SYMFONY_DEPS_VERSION' = '' ]; then sed -i 's/~2.3/2.6.*@dev/g' composer.json; composer update --dev --prefer-source; fi" - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.8' ]; then sed -i 's/~2\.3|3\.0\.\*/2.8.*@dev/g' composer.json; composer update; fi"
- sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.3' ]; then sed -i 's/~2.3/2.3.*@dev/g' composer.json; composer update --dev --prefer-source; fi" - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '' ]; then sed -i 's/~2\.3|3\.0\.\*/2.7.*@dev/g' composer.json; composer update; fi"
- composer install --dev --prefer-source - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.3' ]; then sed -i 's/~2\.3|3\.0\.\*/2.3.*@dev/g' composer.json; composer update; fi"
- composer install
script: phpunit script: phpunit
...@@ -22,10 +23,12 @@ matrix: ...@@ -22,10 +23,12 @@ matrix:
- php: 5.4 - php: 5.4
- php: 5.5 - php: 5.5
- php: 5.6 - php: 5.6
env: SYMFONY_DEPS_VERSION=2.3 env: TWIG_VERSION=2.0
- php: 5.6 - php: 5.6
env: SYMFONY_DEPS_VERSION=2.7 env: SYMFONY_DEPS_VERSION=2.3
- php: 5.6 - php: 5.6
env: SYMFONY_DEPS_VERSION=2.8 env: SYMFONY_DEPS_VERSION=2.8
- php: 5.6
env: SYMFONY_DEPS_VERSION=3
- php: 7.0 - php: 7.0
- php: hhvm - php: hhvm
...@@ -17,39 +17,33 @@ ...@@ -17,39 +17,33 @@
"require": { "require": {
"php": ">=5.3.9", "php": ">=5.3.9",
"pimple/pimple": "~1.0", "pimple/pimple": "~1.0",
"symfony/event-dispatcher": "~2.3,<3.0", "symfony/event-dispatcher": "~2.3|3.0.*",
"symfony/http-foundation": "~2.3,<3.0", "symfony/http-foundation": "~2.3|3.0.*",
"symfony/http-kernel": "~2.3,<3.0", "symfony/http-kernel": "~2.3|3.0.*",
"symfony/routing": "~2.3,<3.0" "symfony/routing": "~2.3|3.0.*"
}, },
"require-dev": { "require-dev": {
"symfony/security": "~2.3,<3.0", "symfony/security": "~2.3|3.0.*",
"symfony/config": "~2.3,<3.0", "symfony/config": "~2.3|3.0.*",
"symfony/locale": "~2.3,<3.0", "symfony/locale": "~2.3|3.0.*",
"symfony/form": "~2.3,<3.0", "symfony/form": "~2.3|3.0.*",
"symfony/browser-kit": "~2.3,<3.0", "symfony/browser-kit": "~2.3|3.0.*",
"symfony/css-selector": "~2.3,<3.0", "symfony/css-selector": "~2.3|3.0.*",
"symfony/debug": "~2.3,<3.0", "symfony/debug": "~2.3|3.0.*",
"symfony/dom-crawler": "~2.3,<3.0", "symfony/dom-crawler": "~2.3|3.0.*",
"symfony/finder": "~2.3,<3.0", "symfony/finder": "~2.3|3.0.*",
"symfony/monolog-bridge": "~2.3,<3.0", "symfony/monolog-bridge": "~2.3|3.0.*",
"symfony/options-resolver": "~2.3,<3.0", "symfony/options-resolver": "~2.3|3.0.*",
"symfony/phpunit-bridge": "~2.7,<3.0", "symfony/phpunit-bridge": "~2.7",
"symfony/process": "~2.3,<3.0", "symfony/process": "~2.3|3.0.*",
"symfony/serializer": "~2.3,<3.0", "symfony/serializer": "~2.3|3.0.*",
"symfony/translation": "~2.3,<3.0", "symfony/translation": "~2.3|3.0.*",
"symfony/twig-bridge": "~2.3,<3.0", "symfony/twig-bridge": "~2.3|3.0.*",
"symfony/validator": "~2.3,<3.0", "symfony/validator": "~2.3|3.0.*",
"twig/twig": ">=1.8.0,<2.0-dev", "twig/twig": "~1.8|~2.0",
"doctrine/dbal": "~2.2", "doctrine/dbal": "~2.2",
"swiftmailer/swiftmailer": "5.*", "swiftmailer/swiftmailer": "~5",
"monolog/monolog": "~1.4,>=1.4.1" "monolog/monolog": "^1.4.1"
},
"suggest": {
"symfony/browser-kit": "~2.3",
"symfony/css-selector": "~2.3",
"symfony/dom-crawler": "~2.3",
"symfony/form": "~2.3"
}, },
"autoload": { "autoload": {
"psr-4": { "Silex\\": "src/Silex" } "psr-4": { "Silex\\": "src/Silex" }
......
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