Commit aa68047e authored by Fabien Potencier's avatar Fabien Potencier

minor #1098 updated deps as Silex 1.2 is not compatible with Symfony 2.7 (fabpot)

This PR was merged into the 1.2 branch.

Discussion
----------

updated deps as Silex 1.2 is not compatible with Symfony 2.7

Commits
-------

22d7c8ff updated deps as Silex 1.2 is not compatible with Symfony 2.7
parents 57c98ea0 22d7c8ff
...@@ -2,7 +2,6 @@ language: php ...@@ -2,7 +2,6 @@ language: php
before_script: before_script:
# symfony/* # symfony/*
- 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' = '' ]; then sed -i 's/~2.3/2.6.*@dev/g' composer.json; composer update --dev --prefer-source; 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.5' ]; then sed -i 's/~2.3/2.5.*@dev/g' composer.json; composer update --dev --prefer-source; fi" - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.5' ]; then sed -i 's/~2.3/2.5.*@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.4.*@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.4.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
...@@ -28,5 +27,3 @@ matrix: ...@@ -28,5 +27,3 @@ matrix:
env: SYMFONY_DEPS_VERSION=2.4 env: SYMFONY_DEPS_VERSION=2.4
- php: 5.6 - php: 5.6
env: SYMFONY_DEPS_VERSION=2.5 env: SYMFONY_DEPS_VERSION=2.5
- php: 5.6
env: SYMFONY_DEPS_VERSION=2.7
...@@ -18,28 +18,28 @@ ...@@ -18,28 +18,28 @@
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.3",
"pimple/pimple": "~1.0", "pimple/pimple": "~1.0",
"symfony/event-dispatcher": "~2.3,<3.0", "symfony/event-dispatcher": "~2.3,<2.7",
"symfony/http-foundation": "~2.3,<3.0", "symfony/http-foundation": "~2.3,<2.7",
"symfony/http-kernel": "~2.3,<3.0", "symfony/http-kernel": "~2.3,<2.7",
"symfony/routing": "~2.3,<3.0" "symfony/routing": "~2.3,<2.7"
}, },
"require-dev": { "require-dev": {
"symfony/security": "~2.3,<3.0", "symfony/security": "~2.3,<2.7",
"symfony/config": "~2.3,<3.0", "symfony/config": "~2.3,<2.7",
"symfony/locale": "~2.3,<3.0", "symfony/locale": "~2.3,<2.7",
"symfony/form": "~2.3,<3.0", "symfony/form": "~2.3,<2.7",
"symfony/browser-kit": "~2.3,<3.0", "symfony/browser-kit": "~2.3,<2.7",
"symfony/css-selector": "~2.3,<3.0", "symfony/css-selector": "~2.3,<2.7",
"symfony/debug": "~2.3,<3.0", "symfony/debug": "~2.3,<2.7",
"symfony/dom-crawler": "~2.3,<3.0", "symfony/dom-crawler": "~2.3,<2.7",
"symfony/finder": "~2.3,<3.0", "symfony/finder": "~2.3,<2.7",
"symfony/monolog-bridge": "~2.3,<3.0", "symfony/monolog-bridge": "~2.3,<2.7",
"symfony/options-resolver": "~2.3,<3.0", "symfony/options-resolver": "~2.3,<2.7",
"symfony/process": "~2.3,<3.0", "symfony/process": "~2.3,<2.7",
"symfony/serializer": "~2.3,<3.0", "symfony/serializer": "~2.3,<2.7",
"symfony/translation": "~2.3,<3.0", "symfony/translation": "~2.3,<2.7",
"symfony/twig-bridge": "~2.3,<3.0", "symfony/twig-bridge": "~2.3,<2.7",
"symfony/validator": "~2.3,<3.0", "symfony/validator": "~2.3,<2.7",
"twig/twig": ">=1.8.0,<2.0-dev", "twig/twig": ">=1.8.0,<2.0-dev",
"doctrine/dbal": "~2.2", "doctrine/dbal": "~2.2",
"swiftmailer/swiftmailer": "5.*", "swiftmailer/swiftmailer": "5.*",
......
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