Merge branch 'Sam-Burns-twig2-upgrade'

Closes #70
slimphp · Jan 25, 2017 · 496bffc · 496bffc
2 parents 7dbff1d + 2522ed0
commit 496bffc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
   - hhvm
 
 before_script: composer install

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/slimphp/Twig-View.svg?branch=master)](https://travis-ci.org/slimphp/Twig-View)
 
-This is a Slim Framework view helper built on top of the Twig templating component. You can use this component to create and render templates in your Slim Framework application.
+This is a Slim Framework view helper built on top of the Twig templating component. You can use this component to create and render templates in your Slim Framework application. It works with Twig 1.18+ (PHP5.5+) and with Twig 2 (PHP7).
 
 ## Install
 

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "slim/twig-view",
     "type": "library",
-    "description": "Slim Framework 3 view helper built on top of the Twig templating component",
+    "description": "Slim Framework 3 view helper built on top of the Twig 2 templating component",
     "keywords": ["slim","framework","view","template","twig"],
     "homepage": "http://slimframework.com",
     "license": "MIT",
@@ -14,11 +14,11 @@
     ],
     "require": {
         "php": ">=5.5.0",
-        "twig/twig": "^1.18",
+        "twig/twig": "^1.18|^2.0",
         "psr/http-message": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.0"
+        "phpunit/phpunit": "^4.8|^5.7"
     },
     "autoload": {
         "psr-4": {