Commit 8eb8b190 authored by Fabien Potencier's avatar Fabien Potencier

Revert "Merge branch '1.2' into 1.3"

This reverts commit 1c22ee86, reversing
changes made to 1c7dd57d.
parent 1c22ee86
......@@ -2,6 +2,7 @@ language: php
before_script:
# 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' = '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"
......@@ -27,3 +28,5 @@ matrix:
env: SYMFONY_DEPS_VERSION=2.4
- php: 5.6
env: SYMFONY_DEPS_VERSION=2.5
- php: 5.6
env: SYMFONY_DEPS_VERSION=2.7
......@@ -18,28 +18,28 @@
"require": {
"php": ">=5.3.3",
"pimple/pimple": "~1.0",
"symfony/event-dispatcher": "~2.3,<2.7",
"symfony/http-foundation": "~2.3,<2.7",
"symfony/http-kernel": "~2.3,<2.7",
"symfony/routing": "~2.3,<2.7"
"symfony/event-dispatcher": "~2.3,<3.0",
"symfony/http-foundation": "~2.3,<3.0",
"symfony/http-kernel": "~2.3,<3.0",
"symfony/routing": "~2.3,<3.0"
},
"require-dev": {
"symfony/security": "~2.3,<2.7",
"symfony/config": "~2.3,<2.7",
"symfony/locale": "~2.3,<2.7",
"symfony/form": "~2.3,<2.7",
"symfony/browser-kit": "~2.3,<2.7",
"symfony/css-selector": "~2.3,<2.7",
"symfony/debug": "~2.3,<2.7",
"symfony/dom-crawler": "~2.3,<2.7",
"symfony/finder": "~2.3,<2.7",
"symfony/monolog-bridge": "~2.3,<2.7",
"symfony/options-resolver": "~2.3,<2.7",
"symfony/process": "~2.3,<2.7",
"symfony/serializer": "~2.3,<2.7",
"symfony/translation": "~2.3,<2.7",
"symfony/twig-bridge": "~2.3,<2.7",
"symfony/validator": "~2.3,<2.7",
"symfony/security": "~2.3,<3.0",
"symfony/config": "~2.3,<3.0",
"symfony/locale": "~2.3,<3.0",
"symfony/form": "~2.3,<3.0",
"symfony/browser-kit": "~2.3,<3.0",
"symfony/css-selector": "~2.3,<3.0",
"symfony/debug": "~2.3,<3.0",
"symfony/dom-crawler": "~2.3,<3.0",
"symfony/finder": "~2.3,<3.0",
"symfony/monolog-bridge": "~2.3,<3.0",
"symfony/options-resolver": "~2.3,<3.0",
"symfony/process": "~2.3,<3.0",
"symfony/serializer": "~2.3,<3.0",
"symfony/translation": "~2.3,<3.0",
"symfony/twig-bridge": "~2.3,<3.0",
"symfony/validator": "~2.3,<3.0",
"twig/twig": ">=1.8.0,<2.0-dev",
"doctrine/dbal": "~2.2",
"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