[ticket/15508] Update composer dependencies to allow Twig 2.x

PHPBB3-15508
This commit is contained in:
François-Xavier de Guillebon 2018-01-16 12:39:28 +01:00
parent 6ac85a371a
commit 8e664e92ea
2 changed files with 3 additions and 3 deletions

View file

@ -49,7 +49,7 @@
"symfony/routing": "~3.1", "symfony/routing": "~3.1",
"symfony/twig-bridge": "~3.1", "symfony/twig-bridge": "~3.1",
"symfony/yaml": "~3.1", "symfony/yaml": "~3.1",
"twig/twig": "^1.0" "twig/twig": "^1.0 || ^2.0"
}, },
"require-dev": { "require-dev": {
"fabpot/goutte": "~3.1", "fabpot/goutte": "~3.1",

4
phpBB/composer.lock generated
View file

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "8e1c75ec0aaf938fb328165209dbb9e2", "hash": "415e7ade9807efa2a857ad919e4ccf2a",
"content-hash": "aa8d6a47717887456a0066a1320811e0", "content-hash": "919ca0781fd2e325288e60a4f0e144cd",
"packages": [ "packages": [
{ {
"name": "bantu/ini-get-wrapper", "name": "bantu/ini-get-wrapper",