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

Merge branch 'ticket/14892' into 3.2.x

Browse Source
This commit is contained in:
Marc Alexander 2016-12-06 15:03:24 +01:00
commit 129bfd5e62
2 changed files with 87 additions and 87 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.27"
"twig/twig": "^1.0,<1.25"
},
"require-dev": {
"fabpot/goutte": "~2.0",

172
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": "307b109497afe134eca8bfff8370292f",
"content-hash": "fa6f8c1c0f46a226f55caeecda0233e4",
"hash": "9e6c5df052c3e795ad5985862bbb5797",
"content-hash": "47456b70d82a0df10e5faa0a3dc1c2ae",
"packages": [
{
"name": "bantu/ini-get-wrapper",
@ -658,16 +658,16 @@
},
{
"name": "s9e/text-formatter",
"version": "0.8.3",
"version": "0.8.4",
"source": {
"type": "git",
"url": "https://github.com/s9e/TextFormatter.git",
"reference": "34668fccbe259fbca0331e7a34409c4502ee71bd"
"reference": "919fd772aae4dd889618da1cb18ae746f2a14bb6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/34668fccbe259fbca0331e7a34409c4502ee71bd",
"reference": "34668fccbe259fbca0331e7a34409c4502ee71bd",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/919fd772aae4dd889618da1cb18ae746f2a14bb6",
"reference": "919fd772aae4dd889618da1cb18ae746f2a14bb6",
"shasum": ""
},
"require": {
@ -714,20 +714,20 @@
"parser",
"shortcodes"
],
"time": "2016-11-02 08:14:58"
"time": "2016-11-22 20:10:24"
},
{
"name": "symfony/config",
"version": "v2.8.13",
"version": "v2.8.14",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
"reference": "f8b1922bbda9d2ac86aecd649399040bce849fde"
"reference": "1361bc4e66f97b6202ae83f4190e962c624b5e61"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/config/zipball/f8b1922bbda9d2ac86aecd649399040bce849fde",
"reference": "f8b1922bbda9d2ac86aecd649399040bce849fde",
"url": "https://api.github.com/repos/symfony/config/zipball/1361bc4e66f97b6202ae83f4190e962c624b5e61",
"reference": "1361bc4e66f97b6202ae83f4190e962c624b5e61",
"shasum": ""
},
"require": {
@ -767,20 +767,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
"time": "2016-09-14 20:31:12"
"time": "2016-11-03 07:52:58"
},
{
"name": "symfony/console",
"version": "v2.8.13",
"version": "v2.8.14",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "7350016c8abcab897046f1aead2b766b84d3eff8"
"reference": "a871ba00e0f604dceac64c56c27f99fbeaf4854e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/7350016c8abcab897046f1aead2b766b84d3eff8",
"reference": "7350016c8abcab897046f1aead2b766b84d3eff8",
"url": "https://api.github.com/repos/symfony/console/zipball/a871ba00e0f604dceac64c56c27f99fbeaf4854e",
"reference": "a871ba00e0f604dceac64c56c27f99fbeaf4854e",
"shasum": ""
},
"require": {
@ -828,20 +828,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2016-10-06 01:43:09"
"time": "2016-11-15 23:02:12"
},
{
"name": "symfony/debug",
"version": "v2.8.13",
"version": "v2.8.14",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "8c29235936a47473af16fb91c7c4b7b193c5693c"
"reference": "62a68f640456f6761d752c62d81631428ef0d8a1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/8c29235936a47473af16fb91c7c4b7b193c5693c",
"reference": "8c29235936a47473af16fb91c7c4b7b193c5693c",
"url": "https://api.github.com/repos/symfony/debug/zipball/62a68f640456f6761d752c62d81631428ef0d8a1",
"reference": "62a68f640456f6761d752c62d81631428ef0d8a1",
"shasum": ""
},
"require": {
@ -885,20 +885,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2016-09-06 10:55:00"
"time": "2016-11-15 12:53:17"
},
{
"name": "symfony/dependency-injection",
"version": "v2.8.13",
"version": "v2.8.14",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
"reference": "3d61c765daa1a5832f1d7c767f48886b8d8ea64c"
"reference": "9d2c5033ca70ceade8d7584f997a9d3943f0fe5f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/3d61c765daa1a5832f1d7c767f48886b8d8ea64c",
"reference": "3d61c765daa1a5832f1d7c767f48886b8d8ea64c",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/9d2c5033ca70ceade8d7584f997a9d3943f0fe5f",
"reference": "9d2c5033ca70ceade8d7584f997a9d3943f0fe5f",
"shasum": ""
},
"require": {
@ -948,11 +948,11 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
"time": "2016-10-24 15:52:36"
"time": "2016-11-18 21:10:01"
},
{
"name": "symfony/event-dispatcher",
"version": "v2.8.13",
"version": "v2.8.14",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
@ -1012,7 +1012,7 @@
},
{
"name": "symfony/filesystem",
"version": "v2.8.13",
"version": "v2.8.14",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
@ -1061,16 +1061,16 @@
},
{
"name": "symfony/finder",
"version": "v2.8.13",
"version": "v2.8.14",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "bc24c8f5674c6f6841f2856b70e5d60784be5691"
"reference": "0023b024363dfc0cd21262e556f25a291fe8d7fd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/bc24c8f5674c6f6841f2856b70e5d60784be5691",
"reference": "bc24c8f5674c6f6841f2856b70e5d60784be5691",
"url": "https://api.github.com/repos/symfony/finder/zipball/0023b024363dfc0cd21262e556f25a291fe8d7fd",
"reference": "0023b024363dfc0cd21262e556f25a291fe8d7fd",
"shasum": ""
},
"require": {
@ -1106,20 +1106,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"time": "2016-09-28 00:10:16"
"time": "2016-11-03 07:52:58"
},
{
"name": "symfony/http-foundation",
"version": "v2.8.13",
"version": "v2.8.14",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "a6e6c34d337f3c74c39b29c5f54d33023de8897c"
"reference": "4f8c167732bbf3ba4284c0915f57b332091f6b68"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/a6e6c34d337f3c74c39b29c5f54d33023de8897c",
"reference": "a6e6c34d337f3c74c39b29c5f54d33023de8897c",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/4f8c167732bbf3ba4284c0915f57b332091f6b68",
"reference": "4f8c167732bbf3ba4284c0915f57b332091f6b68",
"shasum": ""
},
"require": {
@ -1161,20 +1161,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"time": "2016-10-24 15:52:36"
"time": "2016-11-15 23:02:12"
},
{
"name": "symfony/http-kernel",
"version": "v2.8.13",
"version": "v2.8.14",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "ba7249f746da1544512c942c50ef3bc4026296e6"
"reference": "29d9bb59c6d895e65d8fea3859c96c3b6e9368ba"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/ba7249f746da1544512c942c50ef3bc4026296e6",
"reference": "ba7249f746da1544512c942c50ef3bc4026296e6",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/29d9bb59c6d895e65d8fea3859c96c3b6e9368ba",
"reference": "29d9bb59c6d895e65d8fea3859c96c3b6e9368ba",
"shasum": ""
},
"require": {
@ -1243,7 +1243,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
"time": "2016-10-27 02:18:22"
"time": "2016-11-21 02:24:42"
},
{
"name": "symfony/polyfill-mbstring",
@ -1420,7 +1420,7 @@
},
{
"name": "symfony/proxy-manager-bridge",
"version": "v2.8.13",
"version": "v2.8.14",
"source": {
"type": "git",
"url": "https://github.com/symfony/proxy-manager-bridge.git",
@ -1474,7 +1474,7 @@
},
{
"name": "symfony/routing",
"version": "v2.8.13",
"version": "v2.8.14",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
@ -1549,21 +1549,21 @@
},
{
"name": "symfony/twig-bridge",
"version": "v2.8.12",
"version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/twig-bridge.git",
"reference": "5586685d161c411ab33a9ea72d3b25a337337942"
"reference": "5e9679f7085e99adb5248e07b4677494b8f884b5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/twig-bridge/zipball/5586685d161c411ab33a9ea72d3b25a337337942",
"reference": "5586685d161c411ab33a9ea72d3b25a337337942",
"url": "https://api.github.com/repos/symfony/twig-bridge/zipball/5e9679f7085e99adb5248e07b4677494b8f884b5",
"reference": "5e9679f7085e99adb5248e07b4677494b8f884b5",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
"twig/twig": "~1.26|~2.0"
"twig/twig": "~1.23|~2.0"
},
"require-dev": {
"symfony/asset": "~2.7|~3.0.0",
@ -1626,20 +1626,20 @@
],
"description": "Symfony Twig Bridge",
"homepage": "https://symfony.com",
"time": "2016-10-03 15:49:46"
"time": "2016-09-06 10:55:00"
},
{
"name": "symfony/yaml",
"version": "v2.8.13",
"version": "v2.8.14",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "396784cd06b91f3db576f248f2402d547a077787"
"reference": "befb26a3713c97af90d25dd12e75621ef14d91ff"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/396784cd06b91f3db576f248f2402d547a077787",
"reference": "396784cd06b91f3db576f248f2402d547a077787",
"url": "https://api.github.com/repos/symfony/yaml/zipball/befb26a3713c97af90d25dd12e75621ef14d91ff",
"reference": "befb26a3713c97af90d25dd12e75621ef14d91ff",
"shasum": ""
},
"require": {
@ -1675,20 +1675,20 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2016-10-21 20:59:10"
"time": "2016-11-14 16:15:57"
},
{
"name": "twig/twig",
"version": "v1.26.1",
"version": "v1.24.2",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "a09d8ee17ac1cfea29ed60c83960ad685c6a898d"
"reference": "33093f6e310e6976baeac7b14f3a6ec02f2d79b7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/a09d8ee17ac1cfea29ed60c83960ad685c6a898d",
"reference": "a09d8ee17ac1cfea29ed60c83960ad685c6a898d",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/33093f6e310e6976baeac7b14f3a6ec02f2d79b7",
"reference": "33093f6e310e6976baeac7b14f3a6ec02f2d79b7",
"shasum": ""
},
"require": {
@ -1701,7 +1701,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.26-dev"
"dev-master": "1.24-dev"
}
},
"autoload": {
@ -1736,7 +1736,7 @@
"keywords": [
"templating"
],
"time": "2016-10-05 18:57:41"
"time": "2016-09-01 17:50:53"
},
{
"name": "zendframework/zend-code",
@ -2716,22 +2716,22 @@
},
{
"name": "sebastian/comparator",
"version": "1.2.0",
"version": "1.2.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
"reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
"reference": "6a1ed12e8b2409076ab22e3897126211ff8b1f7f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
"reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/6a1ed12e8b2409076ab22e3897126211ff8b1f7f",
"reference": "6a1ed12e8b2409076ab22e3897126211ff8b1f7f",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"sebastian/diff": "~1.2",
"sebastian/exporter": "~1.2"
"sebastian/exporter": "~1.2 || ~2.0"
},
"require-dev": {
"phpunit/phpunit": "~4.4"
@ -2776,7 +2776,7 @@
"compare",
"equality"
],
"time": "2015-07-26 15:48:44"
"time": "2016-11-19 09:18:40"
},
{
"name": "sebastian/diff",
@ -3037,16 +3037,16 @@
},
{
"name": "squizlabs/php_codesniffer",
"version": "2.7.0",
"version": "2.7.1",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "571e27b6348e5b3a637b2abc82ac0d01e6d7bbed"
"reference": "9b324f3a1132459a7274a0ace2e1b766ba80930f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/571e27b6348e5b3a637b2abc82ac0d01e6d7bbed",
"reference": "571e27b6348e5b3a637b2abc82ac0d01e6d7bbed",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9b324f3a1132459a7274a0ace2e1b766ba80930f",
"reference": "9b324f3a1132459a7274a0ace2e1b766ba80930f",
"shasum": ""
},
"require": {
@ -3111,11 +3111,11 @@
"phpcs",
"standards"
],
"time": "2016-09-01 23:53:02"
"time": "2016-11-30 04:02:31"
},
{
"name": "symfony/browser-kit",
"version": "v2.8.13",
"version": "v2.8.14",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
@ -3172,16 +3172,16 @@
},
{
"name": "symfony/css-selector",
"version": "v2.8.13",
"version": "v2.8.14",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "71c8c3a04c126300c37089b1baa7c6322dfb845f"
"reference": "981abbbd6ba49af338a98490cbe29e7f39ca9fa9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/71c8c3a04c126300c37089b1baa7c6322dfb845f",
"reference": "71c8c3a04c126300c37089b1baa7c6322dfb845f",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/981abbbd6ba49af338a98490cbe29e7f39ca9fa9",
"reference": "981abbbd6ba49af338a98490cbe29e7f39ca9fa9",
"shasum": ""
},
"require": {
@ -3221,20 +3221,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
"time": "2016-09-06 10:55:00"
"time": "2016-11-03 07:52:58"
},
{
"name": "symfony/dom-crawler",
"version": "v2.8.13",
"version": "v2.8.14",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
"reference": "a94f3fe6f179d6453e5ed8188cf4bfdf933d85f4"
"reference": "7f565fe00e580c1edf732234a6d26e9b796bd105"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/a94f3fe6f179d6453e5ed8188cf4bfdf933d85f4",
"reference": "a94f3fe6f179d6453e5ed8188cf4bfdf933d85f4",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7f565fe00e580c1edf732234a6d26e9b796bd105",
"reference": "7f565fe00e580c1edf732234a6d26e9b796bd105",
"shasum": ""
},
"require": {
@ -3277,11 +3277,11 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
"time": "2016-10-18 15:35:45"
"time": "2016-11-14 16:15:57"
},
{
"name": "symfony/process",
"version": "v2.8.13",
"version": "v2.8.14",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",