Merge pull request #30 from smoench/patch-1

added symfony 3 support + test more php versions on travis
asm89 · Jul 25, 2016 · bbf7bc4 · bbf7bc4
2 parents 46079fe + 339fdf9
commit bbf7bc4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,13 @@
 language: php
 
+sudo: false
+
 php:
  - 5.3
  - 5.4
  - 5.5
-
-matrix:
- allow_failures:
- - php: 5.5
+ - 5.6
+ - 7.0
 
 before_script: composer install
 

diff --git a/composer.json b/composer.json
@@ -12,9 +12,9 @@
  }
  ],
  "require": {
- "symfony/console": "~2.1",
- "symfony/finder": "~2.1",
- "twig/twig": ">=1.16.2,<2.0"
+ "symfony/console": "^2.1 || ^3.0",
+ "symfony/finder": "^2.1 || ^3.0",
+ "twig/twig": "^1.16.2"
  },
  "autoload": {
  "psr-0": { "Asm89\\Twig\\Lint\\": "src/" }