Commit 0819b49a authored by Romain Neutron's avatar Romain Neutron Committed by Fabien Potencier

Enable compatibility and testing with Symfony 2.4

parent 1f1fc4e6
...@@ -2,10 +2,12 @@ language: php ...@@ -2,10 +2,12 @@ language: php
env: env:
- SYMFONY_DEPS_VERSION=2.3 - SYMFONY_DEPS_VERSION=2.3
- SYMFONY_DEPS_VERSION=2.4
before_script: before_script:
# symfony/* # symfony/*
- sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.3' ]; then sed -i 's/>=2.3,<2.4-dev/2.3.*@dev/g' composer.json; composer update --dev --prefer-source; fi" - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.4' ]; then sed -i 's/>=2.3,<2.5-dev/2.4.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
- sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.3' ]; then sed -i 's/>=2.3,<2.5-dev/2.3.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
- composer install --dev --prefer-source - composer install --dev --prefer-source
script: vendor/bin/phpunit script: vendor/bin/phpunit
......
...@@ -18,27 +18,27 @@ ...@@ -18,27 +18,27 @@
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.3",
"pimple/pimple": "1.*", "pimple/pimple": "1.*",
"symfony/event-dispatcher": ">=2.3,<2.4-dev", "symfony/event-dispatcher": ">=2.3,<2.5-dev",
"symfony/http-foundation": ">=2.3,<2.4-dev", "symfony/http-foundation": ">=2.3,<2.5-dev",
"symfony/http-kernel": ">=2.3,<2.4-dev", "symfony/http-kernel": ">=2.3,<2.5-dev",
"symfony/routing": ">=2.3,<2.4-dev" "symfony/routing": ">=2.3,<2.5-dev"
}, },
"require-dev": { "require-dev": {
"symfony/security": ">=2.3,<2.4-dev", "symfony/security": ">=2.3,<2.5-dev",
"symfony/config": ">=2.3,<2.4-dev", "symfony/config": ">=2.3,<2.5-dev",
"symfony/locale": ">=2.3,<2.4-dev", "symfony/locale": ">=2.3,<2.5-dev",
"symfony/form": ">=2.3,<2.4-dev", "symfony/form": ">=2.3,<2.5-dev",
"symfony/browser-kit": ">=2.3,<2.4-dev", "symfony/browser-kit": ">=2.3,<2.5-dev",
"symfony/css-selector": ">=2.3,<2.4-dev", "symfony/css-selector": ">=2.3,<2.5-dev",
"symfony/dom-crawler": ">=2.3,<2.4-dev", "symfony/dom-crawler": ">=2.3,<2.5-dev",
"symfony/finder": ">=2.3,<2.4-dev", "symfony/finder": ">=2.3,<2.5-dev",
"symfony/monolog-bridge": ">=2.3,<2.4-dev", "symfony/monolog-bridge": ">=2.3,<2.5-dev",
"symfony/options-resolver": ">=2.3,<2.4-dev", "symfony/options-resolver": ">=2.3,<2.5-dev",
"symfony/process": ">=2.3,<2.4-dev", "symfony/process": ">=2.3,<2.5-dev",
"symfony/serializer": ">=2.3,<2.4-dev", "symfony/serializer": ">=2.3,<2.5-dev",
"symfony/translation": ">=2.3,<2.4-dev", "symfony/translation": ">=2.3,<2.5-dev",
"symfony/twig-bridge": ">=2.3,<2.4-dev", "symfony/twig-bridge": ">=2.3,<2.5-dev",
"symfony/validator": ">=2.3,<2.4-dev", "symfony/validator": ">=2.3,<2.5-dev",
"twig/twig": ">=1.8.0,<2.0-dev", "twig/twig": ">=1.8.0,<2.0-dev",
"doctrine/dbal": ">=2.2.0,<2.4.0-dev", "doctrine/dbal": ">=2.2.0,<2.4.0-dev",
"swiftmailer/swiftmailer": "5.*", "swiftmailer/swiftmailer": "5.*",
...@@ -46,10 +46,10 @@ ...@@ -46,10 +46,10 @@
"phpunit/phpunit": "~3.7" "phpunit/phpunit": "~3.7"
}, },
"suggest": { "suggest": {
"symfony/browser-kit": ">=2.3,<2.4-dev", "symfony/browser-kit": ">=2.3,<2.5-dev",
"symfony/css-selector": ">=2.3,<2.4-dev", "symfony/css-selector": ">=2.3,<2.5-dev",
"symfony/dom-crawler": ">=2.3,<2.4-dev", "symfony/dom-crawler": ">=2.3,<2.5-dev",
"symfony/form": ">=2.3,<2.4-dev" "symfony/form": ">=2.3,<2.5-dev"
}, },
"autoload": { "autoload": {
"psr-0": { "Silex": "src/" } "psr-0": { "Silex": "src/" }
......
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