From 8e664e92ea392b595e7909f2c50a3da26eb85251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20de=20Guillebon?= <fdn2@3ds.com>
Date: Tue, 16 Jan 2018 12:39:28 +0100
Subject: [PATCH] [ticket/15508] Update composer dependencies to allow Twig 2.x

PHPBB3-15508
---
 phpBB/composer.json | 2 +-
 phpBB/composer.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/composer.json b/phpBB/composer.json
index 80de236511..d96d9634c8 100644
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -49,7 +49,7 @@
 		"symfony/routing": "~3.1",
 		"symfony/twig-bridge": "~3.1",
 		"symfony/yaml": "~3.1",
-		"twig/twig": "^1.0"
+		"twig/twig": "^1.0 || ^2.0"
 	},
 	"require-dev": {
 		"fabpot/goutte": "~3.1",
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index 37260a10ec..da1ae177ba 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "8e1c75ec0aaf938fb328165209dbb9e2",
-    "content-hash": "aa8d6a47717887456a0066a1320811e0",
+    "hash": "415e7ade9807efa2a857ad919e4ccf2a",
+    "content-hash": "919ca0781fd2e325288e60a4f0e144cd",
     "packages": [
         {
             "name": "bantu/ini-get-wrapper",