mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-20 23:51:28 +01:00
Code Issues Releases Wiki Activity

Merge pull request #4799 from marc1706/ticket/15179

Browse Source 
[ticket/15179] Update dependencies and fix compatibility with newer twig
This commit is contained in:
Marc Alexander 2017-06-11 16:44:15 +02:00
commit c830af48bd
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
5 changed files with 210 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/composer.json
View File

@ -47,7 +47,7 @@
"symfony/routing": "^2.8",
"symfony/twig-bridge": "^2.8",
"symfony/yaml": "^2.8",
"twig/twig": "^1.0,<1.25"
"twig/twig": "^1.0"
},
"require-dev": {
"fabpot/goutte": "~2.0",

381
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",
"This file is @generated automatically"
],
"hash": "fa77bb5667bcac933b072b639a44aec0",
"content-hash": "da4fd9fbb589d2cffaa3f0168875475d",
"hash": "a66e58446c273c4b92f8e5f227180be8",
"content-hash": "d3646acce6058e89ebcf76debb7f72ea",
"packages": [
{
"name": "bantu/ini-get-wrapper",
@ -342,7 +342,7 @@
"oauth",
"security"
],
"time": "2016-07-12 22:15:00"
"time": "2016-07-12 22:15:00"
},
{
"name": "marc1706/fast-image-size",
@ -460,16 +460,16 @@
},
{
"name": "paragonie/random_compat",
"version": "v1.4.1",
"version": "v1.4.2",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
"reference": "c7e26a21ba357863de030f0b9e701c7d04593774"
"reference": "965cdeb01fdcab7653253aa81d40441d261f1e66"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/c7e26a21ba357863de030f0b9e701c7d04593774",
"reference": "c7e26a21ba357863de030f0b9e701c7d04593774",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/965cdeb01fdcab7653253aa81d40441d261f1e66",
"reference": "965cdeb01fdcab7653253aa81d40441d261f1e66",
"shasum": ""
},
"require": {
@ -504,7 +504,7 @@
"pseudorandom",
"random"
],
"time": "2016-03-18 20:34:03"
"time": "2017-03-13 16:22:52"
},
{
"name": "patchwork/utf8",
@ -614,27 +614,25 @@
},
{
"name": "react/promise",
"version": "v2.4.1",
"version": "v2.5.1",
"source": {
"type": "git",
"url": "https://github.com/reactphp/promise.git",
"reference": "8025426794f1944de806618671d4fa476dc7626f"
"reference": "62785ae604c8d69725d693eb370e1d67e94c4053"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/reactphp/promise/zipball/8025426794f1944de806618671d4fa476dc7626f",
"reference": "8025426794f1944de806618671d4fa476dc7626f",
"url": "https://api.github.com/repos/reactphp/promise/zipball/62785ae604c8d69725d693eb370e1d67e94c4053",
"reference": "62785ae604c8d69725d693eb370e1d67e94c4053",
"shasum": ""
},
"require": {
"php": ">=5.4.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0-dev"
}
"require-dev": {
"phpunit/phpunit": "~4.8"
},
"type": "library",
"autoload": {
"psr-4": {
"React\\Promise\\": "src/"
@ -654,20 +652,24 @@
}
],
"description": "A lightweight implementation of CommonJS Promises/A for PHP",
"time": "2016-05-03 17:50:52"
"keywords": [
"promise",
"promises"
],
"time": "2017-03-25 12:08:31"
},
{
"name": "s9e/text-formatter",
"version": "0.9.1",
"version": "0.9.6",
"source": {
"type": "git",
"url": "https://github.com/s9e/TextFormatter.git",
"reference": "e0f1d477d5c24dff11fa3aaa408d8ead07006fe3"
"reference": "077c510109f3011dec68a5bcbaeb93a1f9138128"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/e0f1d477d5c24dff11fa3aaa408d8ead07006fe3",
"reference": "e0f1d477d5c24dff11fa3aaa408d8ead07006fe3",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/077c510109f3011dec68a5bcbaeb93a1f9138128",
"reference": "077c510109f3011dec68a5bcbaeb93a1f9138128",
"shasum": ""
},
"require": {
@ -719,26 +721,29 @@
"parser",
"shortcodes"
],
"time": "2017-01-22 17:12:21"
"time": "2017-05-10 19:37:30"
},
{
"name": "symfony/config",
"version": "v2.8.14",
"version": "v2.8.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
"reference": "1361bc4e66f97b6202ae83f4190e962c624b5e61"
"reference": "0b8541d18507d10204a08384640ff6df3c739ebe"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/config/zipball/1361bc4e66f97b6202ae83f4190e962c624b5e61",
"reference": "1361bc4e66f97b6202ae83f4190e962c624b5e61",
"url": "https://api.github.com/repos/symfony/config/zipball/0b8541d18507d10204a08384640ff6df3c739ebe",
"reference": "0b8541d18507d10204a08384640ff6df3c739ebe",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
"symfony/filesystem": "~2.3|~3.0.0"
},
"require-dev": {
"symfony/yaml": "~2.7|~3.0.0"
},
"suggest": {
"symfony/yaml": "To use the yaml reference dumper"
},
@ -772,25 +777,25 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
"time": "2016-11-03 07:52:58"
"time": "2017-04-12 14:07:15"
},
{
"name": "symfony/console",
"version": "v2.8.14",
"version": "v2.8.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "a871ba00e0f604dceac64c56c27f99fbeaf4854e"
"reference": "efa4d466b67c2fc9bf9419a981e683e1f99fa029"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/a871ba00e0f604dceac64c56c27f99fbeaf4854e",
"reference": "a871ba00e0f604dceac64c56c27f99fbeaf4854e",
"url": "https://api.github.com/repos/symfony/console/zipball/efa4d466b67c2fc9bf9419a981e683e1f99fa029",
"reference": "efa4d466b67c2fc9bf9419a981e683e1f99fa029",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
"symfony/debug": "~2.7,>=2.7.2|~3.0.0",
"symfony/debug": "^2.7.2|~3.0.0",
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
@ -833,20 +838,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2016-11-15 23:02:12"
"time": "2017-05-28 14:07:33"
},
{
"name": "symfony/debug",
"version": "v2.8.14",
"version": "v2.8.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "62a68f640456f6761d752c62d81631428ef0d8a1"
"reference": "344f50ce827413b3640bfcb1e37386a67d06ea1f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/62a68f640456f6761d752c62d81631428ef0d8a1",
"reference": "62a68f640456f6761d752c62d81631428ef0d8a1",
"url": "https://api.github.com/repos/symfony/debug/zipball/344f50ce827413b3640bfcb1e37386a67d06ea1f",
"reference": "344f50ce827413b3640bfcb1e37386a67d06ea1f",
"shasum": ""
},
"require": {
@ -858,7 +863,7 @@
},
"require-dev": {
"symfony/class-loader": "~2.2|~3.0.0",
"symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2|~3.0.0"
"symfony/http-kernel": "~2.3.24|~2.5.9|^2.6.2|~3.0.0"
},
"type": "library",
"extra": {
@ -890,20 +895,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2016-11-15 12:53:17"
"time": "2017-04-19 19:56:30"
},
{
"name": "symfony/dependency-injection",
"version": "v2.8.14",
"version": "v2.8.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
"reference": "9d2c5033ca70ceade8d7584f997a9d3943f0fe5f"
"reference": "155b770e68150139779295864d6b6cb3172cd821"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/9d2c5033ca70ceade8d7584f997a9d3943f0fe5f",
"reference": "9d2c5033ca70ceade8d7584f997a9d3943f0fe5f",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/155b770e68150139779295864d6b6cb3172cd821",
"reference": "155b770e68150139779295864d6b6cb3172cd821",
"shasum": ""
},
"require": {
@ -953,20 +958,20 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
"time": "2016-11-18 21:10:01"
"time": "2017-05-25 22:57:22"
},
{
"name": "symfony/event-dispatcher",
"version": "v2.8.14",
"version": "v2.8.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "25c576abd4e0f212e678fe8b2bd9a9a98c7ea934"
"reference": "7fc8e2b4118ff316550596357325dfd92a51f531"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/25c576abd4e0f212e678fe8b2bd9a9a98c7ea934",
"reference": "25c576abd4e0f212e678fe8b2bd9a9a98c7ea934",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7fc8e2b4118ff316550596357325dfd92a51f531",
"reference": "7fc8e2b4118ff316550596357325dfd92a51f531",
"shasum": ""
},
"require": {
@ -974,7 +979,7 @@
},
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~2.0,>=2.0.5|~3.0.0",
"symfony/config": "^2.0.5|~3.0.0",
"symfony/dependency-injection": "~2.6|~3.0.0",
"symfony/expression-language": "~2.6|~3.0.0",
"symfony/stopwatch": "~2.3|~3.0.0"
@ -1013,20 +1018,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2016-10-13 01:43:15"
"time": "2017-04-26 16:56:54"
},
{
"name": "symfony/filesystem",
"version": "v2.8.14",
"version": "v2.8.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "a3784111af9f95f102b6411548376e1ae7c93898"
"reference": "19c11158da8d110cc5289c063bf2ec4cc1ce9e7c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/a3784111af9f95f102b6411548376e1ae7c93898",
"reference": "a3784111af9f95f102b6411548376e1ae7c93898",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/19c11158da8d110cc5289c063bf2ec4cc1ce9e7c",
"reference": "19c11158da8d110cc5289c063bf2ec4cc1ce9e7c",
"shasum": ""
},
"require": {
@ -1062,20 +1067,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
"time": "2016-10-18 04:28:30"
"time": "2017-05-28 14:07:33"
},
{
"name": "symfony/finder",
"version": "v2.8.14",
"version": "v2.8.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "0023b024363dfc0cd21262e556f25a291fe8d7fd"
"reference": "b058a6f0cb6ee9b6b727aae03d5a62474a308528"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/0023b024363dfc0cd21262e556f25a291fe8d7fd",
"reference": "0023b024363dfc0cd21262e556f25a291fe8d7fd",
"url": "https://api.github.com/repos/symfony/finder/zipball/b058a6f0cb6ee9b6b727aae03d5a62474a308528",
"reference": "b058a6f0cb6ee9b6b727aae03d5a62474a308528",
"shasum": ""
},
"require": {
@ -1111,20 +1116,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"time": "2016-11-03 07:52:58"
"time": "2017-05-25 22:57:22"
},
{
"name": "symfony/http-foundation",
"version": "v2.8.14",
"version": "v2.8.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "4f8c167732bbf3ba4284c0915f57b332091f6b68"
"reference": "03bf5ded5a4b54473e7551df5cfab854f7434ed4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/4f8c167732bbf3ba4284c0915f57b332091f6b68",
"reference": "4f8c167732bbf3ba4284c0915f57b332091f6b68",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/03bf5ded5a4b54473e7551df5cfab854f7434ed4",
"reference": "03bf5ded5a4b54473e7551df5cfab854f7434ed4",
"shasum": ""
},
"require": {
@ -1166,27 +1171,27 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"time": "2016-11-15 23:02:12"
"time": "2017-05-19 11:49:58"
},
{
"name": "symfony/http-kernel",
"version": "v2.8.14",
"version": "v2.8.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "29d9bb59c6d895e65d8fea3859c96c3b6e9368ba"
"reference": "ae9dd4cfde4a3efa94475863fc330825715fe549"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/29d9bb59c6d895e65d8fea3859c96c3b6e9368ba",
"reference": "29d9bb59c6d895e65d8fea3859c96c3b6e9368ba",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/ae9dd4cfde4a3efa94475863fc330825715fe549",
"reference": "ae9dd4cfde4a3efa94475863fc330825715fe549",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
"psr/log": "~1.0",
"symfony/debug": "~2.6,>=2.6.2",
"symfony/event-dispatcher": "~2.6,>=2.6.7|~3.0.0",
"symfony/debug": "^2.6.2",
"symfony/event-dispatcher": "^2.6.7|~3.0.0",
"symfony/http-foundation": "~2.7.20|~2.8.13|~3.1.6"
},
"conflict": {
@ -1197,16 +1202,16 @@
"symfony/class-loader": "~2.1|~3.0.0",
"symfony/config": "~2.8",
"symfony/console": "~2.3|~3.0.0",
"symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
"symfony/css-selector": "^2.0.5|~3.0.0",
"symfony/dependency-injection": "~2.8|~3.0.0",
"symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
"symfony/dom-crawler": "^2.0.5|~3.0.0",
"symfony/expression-language": "~2.4|~3.0.0",
"symfony/finder": "~2.0,>=2.0.5|~3.0.0",
"symfony/process": "~2.0,>=2.0.5|~3.0.0",
"symfony/finder": "^2.0.5|~3.0.0",
"symfony/process": "^2.0.5|~3.0.0",
"symfony/routing": "~2.8|~3.0.0",
"symfony/stopwatch": "~2.3|~3.0.0",
"symfony/templating": "~2.2|~3.0.0",
"symfony/translation": "~2.0,>=2.0.5|~3.0.0",
"symfony/translation": "^2.0.5|~3.0.0",
"symfony/var-dumper": "~2.6|~3.0.0"
},
"suggest": {
@ -1248,7 +1253,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
"time": "2016-11-21 02:24:42"
"time": "2017-05-29 19:14:58"
},
{
"name": "symfony/polyfill-mbstring",
@ -1425,16 +1430,16 @@
},
{
"name": "symfony/proxy-manager-bridge",
"version": "v2.8.14",
"version": "v2.8.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/proxy-manager-bridge.git",
"reference": "69922100cdfe37bc9c0429cab5bd523e861e562e"
"reference": "991c0fcd1d461ee9c7cde7d2c44d1ed7f4cc36ae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/69922100cdfe37bc9c0429cab5bd523e861e562e",
"reference": "69922100cdfe37bc9c0429cab5bd523e861e562e",
"url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/991c0fcd1d461ee9c7cde7d2c44d1ed7f4cc36ae",
"reference": "991c0fcd1d461ee9c7cde7d2c44d1ed7f4cc36ae",
"shasum": ""
},
"require": {
@ -1475,20 +1480,20 @@
],
"description": "Symfony ProxyManager Bridge",
"homepage": "https://symfony.com",
"time": "2016-10-03 15:49:46"
"time": "2017-04-12 14:07:15"
},
{
"name": "symfony/routing",
"version": "v2.8.14",
"version": "v2.8.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "6cee3ed22c778a7410119a3d51a20f60252a156c"
"reference": "a8f328c7e701b7bb05a93fca62a5ab2b6b3e500e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/6cee3ed22c778a7410119a3d51a20f60252a156c",
"reference": "6cee3ed22c778a7410119a3d51a20f60252a156c",
"url": "https://api.github.com/repos/symfony/routing/zipball/a8f328c7e701b7bb05a93fca62a5ab2b6b3e500e",
"reference": "a8f328c7e701b7bb05a93fca62a5ab2b6b3e500e",
"shasum": ""
},
"require": {
@ -1504,7 +1509,7 @@
"symfony/config": "~2.7|~3.0.0",
"symfony/expression-language": "~2.4|~3.0.0",
"symfony/http-foundation": "~2.3|~3.0.0",
"symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
"symfony/yaml": "^2.0.5|~3.0.0"
},
"suggest": {
"doctrine/annotations": "For using the annotation loader",
@ -1550,32 +1555,32 @@
"uri",
"url"
],
"time": "2016-08-16 14:56:08"
"time": "2017-04-12 14:07:15"
},
{
"name": "symfony/twig-bridge",
"version": "v2.8.11",
"version": "v2.8.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/twig-bridge.git",
"reference": "5e9679f7085e99adb5248e07b4677494b8f884b5"
"reference": "362aa855b5819355811b58f8b5f15679196a181e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/twig-bridge/zipball/5e9679f7085e99adb5248e07b4677494b8f884b5",
"reference": "5e9679f7085e99adb5248e07b4677494b8f884b5",
"url": "https://api.github.com/repos/symfony/twig-bridge/zipball/362aa855b5819355811b58f8b5f15679196a181e",
"reference": "362aa855b5819355811b58f8b5f15679196a181e",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
"twig/twig": "~1.23|~2.0"
"twig/twig": "~1.28|~2.0"
},
"require-dev": {
"symfony/asset": "~2.7|~3.0.0",
"symfony/console": "~2.8|~3.0.0",
"symfony/expression-language": "~2.4|~3.0.0",
"symfony/finder": "~2.3|~3.0.0",
"symfony/form": "~2.8.4",
"symfony/form": "^2.8.19",
"symfony/http-kernel": "~2.8|~3.0.0",
"symfony/polyfill-intl-icu": "~1.0",
"symfony/routing": "~2.2|~3.0.0",
@ -1585,7 +1590,7 @@
"symfony/templating": "~2.1|~3.0.0",
"symfony/translation": "~2.7|~3.0.0",
"symfony/var-dumper": "~2.7.16|~2.8.9|~3.0.9",
"symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
"symfony/yaml": "^2.0.5|~3.0.0"
},
"suggest": {
"symfony/asset": "For using the AssetExtension",
@ -1631,20 +1636,20 @@
],
"description": "Symfony Twig Bridge",
"homepage": "https://symfony.com",
"time": "2016-09-06 10:55:00"
"time": "2017-04-12 14:07:15"
},
{
"name": "symfony/yaml",
"version": "v2.8.14",
"version": "v2.8.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "befb26a3713c97af90d25dd12e75621ef14d91ff"
"reference": "93ccdde79f4b079c7558da4656a3cb1c50c68e02"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/befb26a3713c97af90d25dd12e75621ef14d91ff",
"reference": "befb26a3713c97af90d25dd12e75621ef14d91ff",
"url": "https://api.github.com/repos/symfony/yaml/zipball/93ccdde79f4b079c7558da4656a3cb1c50c68e02",
"reference": "93ccdde79f4b079c7558da4656a3cb1c50c68e02",
"shasum": ""
},
"require": {
@ -1680,33 +1685,34 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2016-11-14 16:15:57"
"time": "2017-05-01 14:31:55"
},
{
"name": "twig/twig",
"version": "v1.24.2",
"version": "v1.33.2",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "33093f6e310e6976baeac7b14f3a6ec02f2d79b7"
"reference": "dd6ca96227917e1e85b41c7c3cc6507b411e0927"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/33093f6e310e6976baeac7b14f3a6ec02f2d79b7",
"reference": "33093f6e310e6976baeac7b14f3a6ec02f2d79b7",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/dd6ca96227917e1e85b41c7c3cc6507b411e0927",
"reference": "dd6ca96227917e1e85b41c7c3cc6507b411e0927",
"shasum": ""
},
"require": {
"php": ">=5.2.7"
},
"require-dev": {
"psr/container": "^1.0",
"symfony/debug": "~2.7",
"symfony/phpunit-bridge": "~2.7"
"symfony/phpunit-bridge": "~3.3@dev"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.24-dev"
"dev-master": "1.33-dev"
}
},
"autoload": {
@ -1741,7 +1747,7 @@
"keywords": [
"templating"
],
"time": "2016-09-01 17:50:53"
"time": "2017-04-20 17:39:48"
},
{
"name": "zendframework/zend-code",
@ -2239,16 +2245,16 @@
},
{
"name": "phpdocumentor/reflection-docblock",
"version": "2.0.4",
"version": "2.0.5",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
"reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
"reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e6a969a640b00d8daa3c66518b0405fb41ae0c4b",
"reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b",
"shasum": ""
},
"require": {
@ -2284,31 +2290,31 @@
"email": "mike.vanriel@naenius.com"
}
],
"time": "2015-02-03 12:10:50"
"time": "2016-01-25 08:17:30"
},
{
"name": "phpspec/prophecy",
"version": "v1.6.2",
"version": "v1.7.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
"reference": "6c52c2722f8460122f96f86346600e1077ce22cb"
"reference": "93d39f1f7f9326d746203c7c056f300f7f126073"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/6c52c2722f8460122f96f86346600e1077ce22cb",
"reference": "6c52c2722f8460122f96f86346600e1077ce22cb",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073",
"reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
"sebastian/comparator": "^1.1",
"sebastian/recursion-context": "^1.0|^2.0"
"sebastian/comparator": "^1.1|^2.0",
"sebastian/recursion-context": "^1.0|^2.0|^3.0"
},
"require-dev": {
"phpspec/phpspec": "^2.0",
"phpspec/phpspec": "^2.5|^3.2",
"phpunit/phpunit": "^4.8 || ^5.6.5"
},
"type": "library",
@ -2347,7 +2353,7 @@
"spy",
"stub"
],
"time": "2016-11-21 14:58:47"
"time": "2017-03-02 20:05:34"
},
{
"name": "phpunit/dbunit",
@ -2560,25 +2566,30 @@
},
{
"name": "phpunit/php-timer",
"version": "1.0.8",
"version": "1.0.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git",
"reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
"reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
"reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
"reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": "^5.3.3 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "~4|~5"
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": {
"classmap": [
"src/"
@ -2600,20 +2611,20 @@
"keywords": [
"timer"
],
"time": "2016-05-12 18:03:57"
"time": "2017-02-26 11:10:40"
},
{
"name": "phpunit/php-token-stream",
"version": "1.4.9",
"version": "1.4.11",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
"reference": "3b402f65a4cc90abf6e1104e388b896ce209631b"
"reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3b402f65a4cc90abf6e1104e388b896ce209631b",
"reference": "3b402f65a4cc90abf6e1104e388b896ce209631b",
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7",
"reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7",
"shasum": ""
},
"require": {
@ -2649,20 +2660,20 @@
"keywords": [
"tokenizer"
],
"time": "2016-11-15 14:06:22"
"time": "2017-02-27 10:12:30"
},
{
"name": "phpunit/phpunit",
"version": "4.8.31",
"version": "4.8.35",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "98b2b39a520766bec663ff5b7ff1b729db9dbfe3"
"reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/98b2b39a520766bec663ff5b7ff1b729db9dbfe3",
"reference": "98b2b39a520766bec663ff5b7ff1b729db9dbfe3",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/791b1a67c25af50e230f841ee7a9c6eba507dc87",
"reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87",
"shasum": ""
},
"require": {
@ -2721,7 +2732,7 @@
"testing",
"xunit"
],
"time": "2016-12-09 02:45:31"
"time": "2017-02-06 05:18:07"
},
{
"name": "phpunit/phpunit-mock-objects",
@ -2814,7 +2825,9 @@
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
}
],
"description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
@ -2884,16 +2897,16 @@
},
{
"name": "sebastian/comparator",
"version": "1.2.2",
"version": "1.2.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
"reference": "6a1ed12e8b2409076ab22e3897126211ff8b1f7f"
"reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/6a1ed12e8b2409076ab22e3897126211ff8b1f7f",
"reference": "6a1ed12e8b2409076ab22e3897126211ff8b1f7f",
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
"reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
"shasum": ""
},
"require": {
@ -2944,27 +2957,27 @@
"compare",
"equality"
],
"time": "2016-11-19 09:18:40"
"time": "2017-01-29 09:50:25"
},
{
"name": "sebastian/diff",
"version": "1.4.1",
"version": "1.4.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
"reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
"reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
"reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
"reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": "^5.3.3 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "~4.8"
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
},
"type": "library",
"extra": {
@ -2996,7 +3009,7 @@
"keywords": [
"diff"
],
"time": "2015-12-08 07:14:41"
"time": "2017-05-22 07:24:03"
},
{
"name": "sebastian/environment",
@ -3168,16 +3181,16 @@
},
{
"name": "sebastian/recursion-context",
"version": "1.0.4",
"version": "1.0.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
"reference": "938df7a6478e72795e5f8266cff24d06e3136f2e"
"reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/938df7a6478e72795e5f8266cff24d06e3136f2e",
"reference": "938df7a6478e72795e5f8266cff24d06e3136f2e",
"url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
"reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
"shasum": ""
},
"require": {
@ -3217,7 +3230,7 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
"time": "2016-11-15 06:55:36"
"time": "2016-10-03 07:41:43"
},
{
"name": "sebastian/version",
@ -3256,16 +3269,16 @@
},
{
"name": "squizlabs/php_codesniffer",
"version": "2.7.1",
"version": "2.9.1",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "9b324f3a1132459a7274a0ace2e1b766ba80930f"
"reference": "dcbed1074f8244661eecddfc2a675430d8d33f62"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9b324f3a1132459a7274a0ace2e1b766ba80930f",
"reference": "9b324f3a1132459a7274a0ace2e1b766ba80930f",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dcbed1074f8244661eecddfc2a675430d8d33f62",
"reference": "dcbed1074f8244661eecddfc2a675430d8d33f62",
"shasum": ""
},
"require": {
@ -3330,20 +3343,20 @@
"phpcs",
"standards"
],
"time": "2016-11-30 04:02:31"
"time": "2017-05-22 02:43:20"
},
{
"name": "symfony/browser-kit",
"version": "v2.8.14",
"version": "v2.8.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
"reference": "165bf6d1e72cd72f2fe170a070aa2a1f17f2d744"
"reference": "4386755566fc8d29bddf89694663b0e96cb01e61"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/165bf6d1e72cd72f2fe170a070aa2a1f17f2d744",
"reference": "165bf6d1e72cd72f2fe170a070aa2a1f17f2d744",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/4386755566fc8d29bddf89694663b0e96cb01e61",
"reference": "4386755566fc8d29bddf89694663b0e96cb01e61",
"shasum": ""
},
"require": {
@ -3351,8 +3364,8 @@
"symfony/dom-crawler": "~2.1|~3.0.0"
},
"require-dev": {
"symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
"symfony/process": "~2.3.34|~2.7,>=2.7.6|~3.0.0"
"symfony/css-selector": "^2.0.5|~3.0.0",
"symfony/process": "~2.3.34|^2.7.6|~3.0.0"
},
"suggest": {
"symfony/process": ""
@ -3387,20 +3400,20 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com",
"time": "2016-09-06 10:55:00"
"time": "2017-04-12 14:07:15"
},
{
"name": "symfony/css-selector",
"version": "v2.8.14",
"version": "v2.8.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "981abbbd6ba49af338a98490cbe29e7f39ca9fa9"
"reference": "ba3204654efa779691fac9e948a96b4a7067e4ab"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/981abbbd6ba49af338a98490cbe29e7f39ca9fa9",
"reference": "981abbbd6ba49af338a98490cbe29e7f39ca9fa9",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/ba3204654efa779691fac9e948a96b4a7067e4ab",
"reference": "ba3204654efa779691fac9e948a96b4a7067e4ab",
"shasum": ""
},
"require": {
@ -3440,20 +3453,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
"time": "2016-11-03 07:52:58"
"time": "2017-05-01 14:31:55"
},
{
"name": "symfony/dom-crawler",
"version": "v2.8.14",
"version": "v2.8.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
"reference": "7f565fe00e580c1edf732234a6d26e9b796bd105"
"reference": "b19d01ec41c704497b0bee78bce8bf97619c0649"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7f565fe00e580c1edf732234a6d26e9b796bd105",
"reference": "7f565fe00e580c1edf732234a6d26e9b796bd105",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b19d01ec41c704497b0bee78bce8bf97619c0649",
"reference": "b19d01ec41c704497b0bee78bce8bf97619c0649",
"shasum": ""
},
"require": {
@ -3496,20 +3509,20 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
"time": "2016-11-14 16:15:57"
"time": "2017-05-25 22:57:22"
},
{
"name": "symfony/process",
"version": "v2.8.14",
"version": "v2.8.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f"
"reference": "d54232f5682fda2f8bbebff7c81b864646867ab9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f",
"reference": "024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f",
"url": "https://api.github.com/repos/symfony/process/zipball/d54232f5682fda2f8bbebff7c81b864646867ab9",
"reference": "d54232f5682fda2f8bbebff7c81b864646867ab9",
"shasum": ""
},
"require": {
@ -3545,7 +3558,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2016-09-29 14:03:54"
"time": "2017-05-08 01:19:21"
}
],
"aliases": [],

2
phpBB/phpbb/console/command/update/check.php
View File

@ -325,7 +325,7 @@ class check extends \phpbb\console\command\command
$io->table([
$this->language->lang('VERSION'),
$this->language->lang('ANNOUNCEMENT_TOPIC'),
$this->language->lang('DOWNLOAD_LATEST'),
$this->language->lang('DOWNLOAD_LATEST'),
], $rows);
}
}

11
phpBB/phpbb/template/twig/lexer.php
View File

@ -22,6 +22,14 @@ class lexer extends \Twig_Lexer
public function tokenize($code, $filename = null)
{
// Handle \Twig_Source format input
if ($code instanceof \Twig_Source)
{
$source = $code;
$code = $source->getCode();
$filename = $source->getName();
}
// Our phpBB tags
// Commented out tokens are handled separately from the main replace
$phpbb_tags = array(
@ -125,7 +133,8 @@ class lexer extends \Twig_Lexer
// Appends any filters
$code = preg_replace('#{([a-zA-Z0-9_\.]+)(\|[^}]+?)?}#', '{{ $1$2 }}', $code);
return parent::tokenize($code, $filename);
// Tokenize \Twig_Source instance
return parent::tokenize(new \Twig_Source($code, $filename));
}
/**

2
phpBB/phpbb/template/twig/loader.php
View File

@ -35,7 +35,7 @@ class loader extends \Twig_Loader_Filesystem
{
$this->filesystem = $filesystem;
parent::__construct($paths);
parent::__construct($paths, $this->filesystem->realpath(dirname(__FILE__)));
}
/**