allowed Symfony 3.0

silexphp · Sep 8, 2015 · dc97b3a · dc97b3a · theintz · Jan 16, 2016
1 parent 436aded
commit dc97b3a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,11 +8,11 @@ cache:
 
 before_script:
     # 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 [ '$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.3' ]; then sed -i 's/~2.3/2.3.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
-    - composer install --dev --prefer-source
+    - 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' = '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' = '' ]; then sed -i 's/~2\.3|3\.0\.\*/2.7.*@dev/g' composer.json; composer update; fi"
+    - 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
 
@@ -23,9 +23,9 @@ matrix:
         - php: 5.5
         - php: 5.6
           env: SYMFONY_DEPS_VERSION=2.3
-        - php: 5.6
-          env: SYMFONY_DEPS_VERSION=2.7
         - php: 5.6
           env: SYMFONY_DEPS_VERSION=2.8
+        - php: 5.6
+          env: SYMFONY_DEPS_VERSION=3
         - php: 7.0
         - php: hhvm
diff --git a/composer.json b/composer.json
@@ -17,29 +17,29 @@
     "require": {
         "php": ">=5.3.9",
         "pimple/pimple": "~1.0",
-        "symfony/event-dispatcher": "~2.3",
-        "symfony/http-foundation": "~2.3",
-        "symfony/http-kernel": "~2.3",
-        "symfony/routing": "~2.3"
+        "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",
-        "symfony/config": "~2.3",
-        "symfony/locale": "~2.3",
-        "symfony/form": "~2.3",
-        "symfony/browser-kit": "~2.3",
-        "symfony/css-selector": "~2.3",
-        "symfony/debug": "~2.3",
-        "symfony/dom-crawler": "~2.3",
-        "symfony/finder": "~2.3",
-        "symfony/monolog-bridge": "~2.3",
-        "symfony/options-resolver": "~2.3",
+        "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/phpunit-bridge": "~2.7",
-        "symfony/process": "~2.3",
-        "symfony/serializer": "~2.3",
-        "symfony/translation": "~2.3",
-        "symfony/twig-bridge": "~2.3",
-        "symfony/validator": "~2.3",
+        "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",
         "doctrine/dbal": "~2.2",
         "swiftmailer/swiftmailer": "~5",