Merge pull request #9 from giansalex/twig2

Soporte Twig v2
thegreenter · Jun 5, 2019 · ee768cf · ee768cf
2 parents 6c33fab + 32b4543
commit ee768cf
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -6,5 +6,5 @@
 .travis.yml export-ignore
 git_pull.sh export-ignore
 LICENSE export-ignore
-phpunit.xml export-ignore
+phpunit.xml.dist export-ignore
 README.md export-ignore
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,12 @@
 language: php
-sudo: required
 dist: trusty
+
 php:
-  - 5.6
-  - 7.1
+  - '5.6'
+  - '7.1'
 
 before_script:
-  - composer self-update
   - composer install --prefer-source --no-interaction --dev
 
 script:
-  - vendor/bin/phpunit --configuration phpunit.xml
+  - vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
     "type": "library",
     "require": {
 		"php": ">=5.5.9",
-        "twig/twig": "~1.0",
+        "twig/twig": "~1.0 || ~2.0",
         "greenter/core": "^2.1",
         "bacon/bacon-qr-code": "^1.0"
     },

diff --git a/git_pull.sh b/git_pull.sh
diff --git a/phpunit.xml → phpunit.xml.dist b/phpunit.xml → phpunit.xml.dist