From 440e8435d5d849da67467bfd8efedb52baf30256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez=20Crespo?= <jaime.perez@uninett.no>
Date: Wed, 10 Oct 2018 13:56:50 +0200
Subject: [PATCH] Add support for Twig 1 & 2.
---
composer.json | 4 ++--
composer.lock | 29 +++++++++++++++--------------
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/composer.json b/composer.json
index fe2ece85c..81e5e1ec1 100644
--- a/composer.json
+++ b/composer.json
@@ -39,9 +39,9 @@
"simplesamlphp/saml2": "^3.2",
"robrichards/xmlseclibs": "^3.0",
"whitehat101/apr1-md5": "~1.0",
- "twig/twig": "~1.0",
+ "twig/twig": "~1.0 || ~2.0",
"gettext/gettext": "^4.6",
- "jaimeperez/twig-configurable-i18n": "^1.2",
+ "jaimeperez/twig-configurable-i18n": "^2.0",
"symfony/routing": "^3.4",
"symfony/http-foundation": "^3.4",
"symfony/config": "^3.4",
diff --git a/composer.lock b/composer.lock
index 29963d23d..7b36b481c 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": "837be9bb79625f48f9a2e831565d217c",
+ "content-hash": "14aaf0dd50482ab820337a0691231b3d",
"packages": [
{
"name": "gettext/gettext",
@@ -131,16 +131,16 @@
},
{
"name": "jaimeperez/twig-configurable-i18n",
- "version": "v1.2",
+ "version": "v2.0",
"source": {
"type": "git",
"url": "https://github.com/jaimeperez/twig-configurable-i18n.git",
- "reference": "75d4926fd102c9e62219ad7f94a6136d2f2ccd93"
+ "reference": "4ccf150ba9f28d2e31d0622ecc9b81cdc6a2638b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/jaimeperez/twig-configurable-i18n/zipball/75d4926fd102c9e62219ad7f94a6136d2f2ccd93",
- "reference": "75d4926fd102c9e62219ad7f94a6136d2f2ccd93",
+ "url": "https://api.github.com/repos/jaimeperez/twig-configurable-i18n/zipball/4ccf150ba9f28d2e31d0622ecc9b81cdc6a2638b",
+ "reference": "4ccf150ba9f28d2e31d0622ecc9b81cdc6a2638b",
"shasum": ""
},
"require": {
@@ -171,7 +171,7 @@
"translation",
"twig"
],
- "time": "2016-10-03T12:34:15+00:00"
+ "time": "2018-10-10T09:12:46+00:00"
},
{
"name": "paragonie/random_compat",
@@ -1046,21 +1046,22 @@
},
{
"name": "twig/twig",
- "version": "v1.35.4",
+ "version": "v2.5.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a"
+ "reference": "6a5f676b77a90823c2d4eaf76137b771adf31323"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/7e081e98378a1e78c29cc9eba4aefa5d78a05d2a",
- "reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/6a5f676b77a90823c2d4eaf76137b771adf31323",
+ "reference": "6a5f676b77a90823c2d4eaf76137b771adf31323",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
- "symfony/polyfill-ctype": "^1.8"
+ "php": "^7.0",
+ "symfony/polyfill-ctype": "^1.8",
+ "symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
"psr/container": "^1.0",
@@ -1070,7 +1071,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.35-dev"
+ "dev-master": "2.5-dev"
}
},
"autoload": {
@@ -1108,7 +1109,7 @@
"keywords": [
"templating"
],
- "time": "2018-07-13T07:12:17+00:00"
+ "time": "2018-07-13T07:18:09+00:00"
},
{
"name": "whitehat101/apr1-md5",
--
GitLab