Merge pull request #32 from kokspflanze/develop

WIP: v3 with twig3 support
kokspflanze · Nov 20, 2019 · 055efde · 055efde
2 parents a663f47 + db44458
commit 055efde
Show file tree

Hide file tree

Showing 14 changed files with 272 additions and 270 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,15 +14,6 @@ cache:
 
 matrix:
   include:
-    - php: 7.1
-      env:
-        - DEPS=lowest
-    - php: 7.1
-      env:
-        - DEPS=locked
-    - php: 7.1
-      env:
-        - DEPS=latest
     - php: 7.2
       env:
         - DEPS=lowest

diff --git a/composer.json b/composer.json
@@ -4,6 +4,8 @@
     "type": "library",
     "keywords": [
         "twig",
+        "twig2",
+        "twig3",
         "module",
         "zf",
         "zf3"
@@ -23,8 +25,8 @@
         }
     ],
     "require": {
-        "php": "^7.1",
-        "twig/twig": "^2.8.1",
+        "php": "^7.2.9",
+        "twig/twig": "^3.0.0",
         "zendframework/zend-mvc": "^3.0",
         "zendframework/zend-view": "^2.7",
         "zendframework/zend-servicemanager": "^3.0",
@@ -43,7 +45,7 @@
     "require-dev": {
         "zendframework/zend-navigation": "^2.7",
         "zendframework/zend-modulemanager": "^2.7",
-        "phpunit/phpunit": "^7.5"
+        "phpunit/phpunit": "^8.4.3"
     },
     "replace": {
         "zf-commons/zfc-twig": "self.version"