Merge pull request #15 from inoas/twig2

Allow Twig ^2.0 / PHP 7 as well as Twig ^1.12 / PHP 5.6
jasny · Sep 13, 2017 · 30bdf3a · 30bdf3a
2 parents 7230fc2 + 6dd971f
commit 30bdf3a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -16,8 +16,8 @@
         "source": "https://github.com/jasny/twig-extensions"
     },
     "require": {
-        "php": ">=5.6.0",
-        "twig/twig": "^1.0"
+        "php": ">=7.0.0 | >=5.6.0",
+        "twig/twig": "^2.0 | ^1.12"
     },
     "suggest": {
         "ext-intl": "Required for the use of the LocalDate Twig extension",
@@ -31,7 +31,8 @@
     "require-dev": {
         "ext-intl": "*",
         "ext-pcre": "*",
-        "jasny/php-code-quality": "^2.1"
+        "jasny/php-code-quality": "^2.1",
+        "phpunit/phpunit": "^5.0"
     },
     "autoload-dev": {
         "classmap": [