Merge branch 'release/3.1.2'

terramar-labs · Jan 29, 2016 · 3790b4b · 3790b4b
2 parents 643779c + d484b20
commit 3790b4b
Show file tree

Hide file tree

Showing 4 changed files with 200 additions and 245 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,10 @@
 language: php
 php:
     - 5.4
+    - 5.5
+    - 5.6
+    - 7.0
 install:
     - composer install
 script:
-    - php ./vendor/bin/phpunit
+    - php ./vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
     "nice/twig": "2.0.x-dev",
     "nice/templating": "1.0.x-dev",
     "chrisboulton/php-resque": "dev-master",
-    "doctrine/migrations": "1.0.x-dev",
+    "doctrine/migrations": "~1.2",
     "symfony/debug": "~2.7",
     "symfony/console": "~2.7",
     "symfony/process": "~2.7",