From e8a8e8a02877226a102e3201649566cb1c2e181b Mon Sep 17 00:00:00 2001 From: Pierre RAMBAUD Date: Mon, 30 Sep 2019 15:21:40 +0200 Subject: [PATCH] Allow twig 1 instead only twig 2 --- composer.json | 2 +- composer.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 0c8dc2a..bbb91a4 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "php": ">=7.1", "smarty/smarty": "^3.1", "nikic/php-parser": "^4", - "twig/twig": "^2.0", + "twig/twig": "^1.34|^2.4", "symfony/twig-bridge": "^3.4" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 2509b92..be1e924 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "51a912179ef69a43f6c7568df35e4f9b", + "content-hash": "a4cdd617423db08dbe6fffb95dc5930c", "packages": [ { "name": "nikic/php-parser", @@ -319,16 +319,16 @@ }, { "name": "twig/twig", - "version": "v2.10.0", + "version": "v2.11.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "5240e21982885b76629552d83b4ebb6d41ccde6b" + "reference": "699ed2342557c88789a15402de5eb834dedd6792" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/5240e21982885b76629552d83b4ebb6d41ccde6b", - "reference": "5240e21982885b76629552d83b4ebb6d41ccde6b", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/699ed2342557c88789a15402de5eb834dedd6792", + "reference": "699ed2342557c88789a15402de5eb834dedd6792", "shasum": "" }, "require": { @@ -339,12 +339,12 @@ "require-dev": { "psr/container": "^1.0", "symfony/debug": "^2.7", - "symfony/phpunit-bridge": "^3.4.19|^4.1.8" + "symfony/phpunit-bridge": "^3.4.19|^4.1.8|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.10-dev" + "dev-master": "2.11-dev" } }, "autoload": { @@ -382,7 +382,7 @@ "keywords": [ "templating" ], - "time": "2019-05-14T12:03:52+00:00" + "time": "2019-06-18T15:37:11+00:00" } ], "packages-dev": [