[ticket/13139] Update Twig to 1.16.2

PHPBB3-13139
This commit is contained in:
Tristan Darricau 2014-10-08 12:16:54 +02:00 committed by Nicofuma
parent 7e91320995
commit e1f983d3cf
2 changed files with 14 additions and 9 deletions

View file

@ -36,7 +36,7 @@
"symfony/routing": "2.5.*", "symfony/routing": "2.5.*",
"symfony/twig-bridge": "2.5.*", "symfony/twig-bridge": "2.5.*",
"symfony/yaml": "2.5.*", "symfony/yaml": "2.5.*",
"twig/twig": "1.13.*" "twig/twig": "1.*"
}, },
"require-dev": { "require-dev": {
"fabpot/goutte": "1.0.*", "fabpot/goutte": "1.0.*",

21
phpBB/composer.lock generated
View file

@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
], ],
"hash": "2faf4ba24774c0d51cff4b78d4a81a68", "hash": "372e66644eb8d1504f88471de6d6dac6",
"packages": [ "packages": [
{ {
"name": "lusitanian/oauth", "name": "lusitanian/oauth",
@ -910,16 +910,16 @@
}, },
{ {
"name": "twig/twig", "name": "twig/twig",
"version": "v1.13.2", "version": "v1.16.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/fabpot/Twig.git", "url": "https://github.com/twigphp/Twig.git",
"reference": "6d6a1009427d1f398c9d40904147bf9f723d5755" "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/fabpot/Twig/zipball/6d6a1009427d1f398c9d40904147bf9f723d5755", "url": "https://api.github.com/repos/twigphp/Twig/zipball/42f758d9fe2146d1f0470604fc05ee43580873fc",
"reference": "6d6a1009427d1f398c9d40904147bf9f723d5755", "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -928,7 +928,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.13-dev" "dev-master": "1.16-dev"
} }
}, },
"autoload": { "autoload": {
@ -951,6 +951,11 @@
"name": "Armin Ronacher", "name": "Armin Ronacher",
"email": "armin.ronacher@active-4.com", "email": "armin.ronacher@active-4.com",
"role": "Project Founder" "role": "Project Founder"
},
{
"name": "Twig Team",
"homepage": "https://github.com/fabpot/Twig/graphs/contributors",
"role": "Contributors"
} }
], ],
"description": "Twig, the flexible, fast, and secure template language for PHP", "description": "Twig, the flexible, fast, and secure template language for PHP",
@ -958,7 +963,7 @@
"keywords": [ "keywords": [
"templating" "templating"
], ],
"time": "2013-08-03 15:35:31" "time": "2014-10-17 12:53:44"
} }
], ],
"packages-dev": [ "packages-dev": [