Compatible with Symfony3

propelorm · Dec 10, 2015 · e365c74 · e365c74
1 parent ead5be0
commit e365c74
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,6 @@ matrix:
     fast_finish: true
     allow_failures:
         - php: hhvm
-        - env: SYMFONY_VERSION="~3.0.0"
         - env: SYMFONY_VERSION="dev-master"
     exclude:
         # Symfony 3.x requires PHP 5.5

diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
         "email": "william.durand1@gmail.com"
     }],
     "require": {
-        "symfony/symfony": "~2.5",
+        "symfony/symfony": "~2.5||~3.0",
         "propel/propel": "2.*@dev"
     },
     "require-dev": {