1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-21 14:59:46 +02:00

Merge branch '3.2.x'

This commit is contained in:
Máté Bartus 2016-08-05 21:29:27 +02:00
commit 6ca10fc85a
2 changed files with 101 additions and 101 deletions

View File

@ -30,10 +30,10 @@
"google/recaptcha": "~1.1",
"guzzlehttp/guzzle": "~6.2",
"lusitanian/oauth": "^0.8.1",
"marc1706/fast-image-size": "1.1.*",
"marc1706/fast-image-size": "~1.1",
"paragonie/random_compat": "^1.2",
"patchwork/utf8": "1.1.*",
"s9e/text-formatter": "^0.5.4",
"s9e/text-formatter": "^0.6",
"symfony/config": "~3.1",
"symfony/console": "~3.1",
"symfony/debug": "~3.1",

198
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": "84320427da5d1b9072b8fed14905435a",
"content-hash": "46539387741e2f185eebfa9e9c14ff84",
"hash": "c0bbd33c537807e58ee22d42c2d2870a",
"content-hash": "5d75d2ffb0668a92e7f14e5365c9852d",
"packages": [
{
"name": "bantu/ini-get-wrapper",
@ -322,16 +322,16 @@
},
{
"name": "marc1706/fast-image-size",
"version": "v1.1.0",
"version": "v1.1.1",
"source": {
"type": "git",
"url": "https://github.com/marc1706/fast-image-size.git",
"reference": "27467cfeca8fb2afd7ef3ffeea6d28a84f79df41"
"reference": "50ae9b13f862b0c7c6c9df057c396ea32837733a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/27467cfeca8fb2afd7ef3ffeea6d28a84f79df41",
"reference": "27467cfeca8fb2afd7ef3ffeea6d28a84f79df41",
"url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/50ae9b13f862b0c7c6c9df057c396ea32837733a",
"reference": "50ae9b13f862b0c7c6c9df057c396ea32837733a",
"shasum": ""
},
"require": {
@ -369,7 +369,7 @@
"php",
"size"
],
"time": "2015-08-21 11:40:30"
"time": "2016-06-08 18:14:49"
},
{
"name": "ocramius/proxy-manager",
@ -622,16 +622,16 @@
},
{
"name": "s9e/text-formatter",
"version": "0.5.4",
"version": "0.6.1",
"source": {
"type": "git",
"url": "https://github.com/s9e/TextFormatter.git",
"reference": "e9363a0d2d6ddef40200854207557c648d36d925"
"reference": "dd0ec47d1ffb5ed5a3eb4e3adbc33db6e0057420"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/e9363a0d2d6ddef40200854207557c648d36d925",
"reference": "e9363a0d2d6ddef40200854207557c648d36d925",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/dd0ec47d1ffb5ed5a3eb4e3adbc33db6e0057420",
"reference": "dd0ec47d1ffb5ed5a3eb4e3adbc33db6e0057420",
"shasum": ""
},
"require": {
@ -678,20 +678,20 @@
"parser",
"shortcodes"
],
"time": "2016-07-08 05:19:02"
"time": "2016-07-30 01:50:02"
},
{
"name": "symfony/config",
"version": "v3.1.2",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
"reference": "bcf5aebabc95b56e370e13d78565f74c7d8726dc"
"reference": "a7630397b91be09cdd2fe57fd13612e258700598"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/config/zipball/bcf5aebabc95b56e370e13d78565f74c7d8726dc",
"reference": "bcf5aebabc95b56e370e13d78565f74c7d8726dc",
"url": "https://api.github.com/repos/symfony/config/zipball/a7630397b91be09cdd2fe57fd13612e258700598",
"reference": "a7630397b91be09cdd2fe57fd13612e258700598",
"shasum": ""
},
"require": {
@ -731,20 +731,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
"time": "2016-06-29 05:41:56"
"time": "2016-07-26 08:04:17"
},
{
"name": "symfony/console",
"version": "v3.1.2",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "747154aa69b0f83cd02fc9aa554836dee417631a"
"reference": "f9e638e8149e9e41b570ff092f8007c477ef0ce5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/747154aa69b0f83cd02fc9aa554836dee417631a",
"reference": "747154aa69b0f83cd02fc9aa554836dee417631a",
"url": "https://api.github.com/repos/symfony/console/zipball/f9e638e8149e9e41b570ff092f8007c477ef0ce5",
"reference": "f9e638e8149e9e41b570ff092f8007c477ef0ce5",
"shasum": ""
},
"require": {
@ -791,20 +791,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2016-06-29 07:02:31"
"time": "2016-07-26 08:04:17"
},
{
"name": "symfony/debug",
"version": "v3.1.2",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "06e2d52e307ef880ac739f44ee6c2418ca9e3283"
"reference": "4c1b48c6a433e194a42ce3d064cd43ceb7c3682f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/06e2d52e307ef880ac739f44ee6c2418ca9e3283",
"reference": "06e2d52e307ef880ac739f44ee6c2418ca9e3283",
"url": "https://api.github.com/repos/symfony/debug/zipball/4c1b48c6a433e194a42ce3d064cd43ceb7c3682f",
"reference": "4c1b48c6a433e194a42ce3d064cd43ceb7c3682f",
"shasum": ""
},
"require": {
@ -848,20 +848,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2016-06-29 05:41:56"
"time": "2016-07-26 08:04:17"
},
{
"name": "symfony/dependency-injection",
"version": "v3.1.2",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
"reference": "b7272b65f2f46cbe77def7d33916f2613669c508"
"reference": "6abd4952d07042d11bbb8122f3b57469691acdb5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/b7272b65f2f46cbe77def7d33916f2613669c508",
"reference": "b7272b65f2f46cbe77def7d33916f2613669c508",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6abd4952d07042d11bbb8122f3b57469691acdb5",
"reference": "6abd4952d07042d11bbb8122f3b57469691acdb5",
"shasum": ""
},
"require": {
@ -870,7 +870,7 @@
"require-dev": {
"symfony/config": "~2.8|~3.0",
"symfony/expression-language": "~2.8|~3.0",
"symfony/yaml": "~2.8|~3.0"
"symfony/yaml": "~2.8.7|~3.0.7|~3.1.1|~3.2"
},
"suggest": {
"symfony/config": "",
@ -908,20 +908,20 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
"time": "2016-06-29 05:42:25"
"time": "2016-07-28 11:13:48"
},
{
"name": "symfony/event-dispatcher",
"version": "v3.1.2",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "7f9839ede2070f53e7e2f0849b9bd14748c434c5"
"reference": "c0c00c80b3a69132c4e55c3e7db32b4a387615e5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7f9839ede2070f53e7e2f0849b9bd14748c434c5",
"reference": "7f9839ede2070f53e7e2f0849b9bd14748c434c5",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c0c00c80b3a69132c4e55c3e7db32b4a387615e5",
"reference": "c0c00c80b3a69132c4e55c3e7db32b4a387615e5",
"shasum": ""
},
"require": {
@ -968,20 +968,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2016-06-29 05:41:56"
"time": "2016-07-19 10:45:57"
},
{
"name": "symfony/filesystem",
"version": "v3.1.2",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "322da5f0910d8aa0b25fa65ffccaba68dbddb890"
"reference": "bb29adceb552d202b6416ede373529338136e84f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/322da5f0910d8aa0b25fa65ffccaba68dbddb890",
"reference": "322da5f0910d8aa0b25fa65ffccaba68dbddb890",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/bb29adceb552d202b6416ede373529338136e84f",
"reference": "bb29adceb552d202b6416ede373529338136e84f",
"shasum": ""
},
"require": {
@ -1017,11 +1017,11 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
"time": "2016-06-29 05:41:56"
"time": "2016-07-20 05:44:26"
},
{
"name": "symfony/finder",
"version": "v3.1.2",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
@ -1070,16 +1070,16 @@
},
{
"name": "symfony/http-foundation",
"version": "v3.1.2",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "6b5a3764c5b0ce1f0ec3b8be5bba969122a78cfc"
"reference": "399a44b73f6c176de40fb063dcdaa578bcfb94d6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/6b5a3764c5b0ce1f0ec3b8be5bba969122a78cfc",
"reference": "6b5a3764c5b0ce1f0ec3b8be5bba969122a78cfc",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/399a44b73f6c176de40fb063dcdaa578bcfb94d6",
"reference": "399a44b73f6c176de40fb063dcdaa578bcfb94d6",
"shasum": ""
},
"require": {
@ -1119,20 +1119,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"time": "2016-06-29 07:02:31"
"time": "2016-07-17 14:02:08"
},
{
"name": "symfony/http-kernel",
"version": "v3.1.2",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "3a1ce1829128988826739bd9dd820f3238b92d65"
"reference": "a8df564d323df5a3fec73085c30211a3ee448fb0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/3a1ce1829128988826739bd9dd820f3238b92d65",
"reference": "3a1ce1829128988826739bd9dd820f3238b92d65",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/a8df564d323df5a3fec73085c30211a3ee448fb0",
"reference": "a8df564d323df5a3fec73085c30211a3ee448fb0",
"shasum": ""
},
"require": {
@ -1201,7 +1201,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
"time": "2016-06-30 17:16:01"
"time": "2016-07-30 09:30:46"
},
{
"name": "symfony/polyfill-mbstring",
@ -1264,16 +1264,16 @@
},
{
"name": "symfony/proxy-manager-bridge",
"version": "v3.1.2",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/proxy-manager-bridge.git",
"reference": "31f3170e0624e523ea795a35a265202a1c927549"
"reference": "f70d804e5ea6f8c1584d9c9d0686aaaf91c2dfed"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/31f3170e0624e523ea795a35a265202a1c927549",
"reference": "31f3170e0624e523ea795a35a265202a1c927549",
"url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/f70d804e5ea6f8c1584d9c9d0686aaaf91c2dfed",
"reference": "f70d804e5ea6f8c1584d9c9d0686aaaf91c2dfed",
"shasum": ""
},
"require": {
@ -1314,11 +1314,11 @@
],
"description": "Symfony ProxyManager Bridge",
"homepage": "https://symfony.com",
"time": "2016-06-29 05:41:56"
"time": "2016-07-19 10:45:57"
},
{
"name": "symfony/routing",
"version": "v3.1.2",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
@ -1393,16 +1393,16 @@
},
{
"name": "symfony/twig-bridge",
"version": "v3.1.2",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/twig-bridge.git",
"reference": "d7044fc3ec23f9a7b626c4798fc013b234756696"
"reference": "5a7f5fa756fef4f287d9adfc479cda043fa8b799"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/twig-bridge/zipball/d7044fc3ec23f9a7b626c4798fc013b234756696",
"reference": "d7044fc3ec23f9a7b626c4798fc013b234756696",
"url": "https://api.github.com/repos/symfony/twig-bridge/zipball/5a7f5fa756fef4f287d9adfc479cda043fa8b799",
"reference": "5a7f5fa756fef4f287d9adfc479cda043fa8b799",
"shasum": ""
},
"require": {
@ -1423,7 +1423,7 @@
"symfony/stopwatch": "~2.8|~3.0",
"symfony/templating": "~2.8|~3.0",
"symfony/translation": "~2.8|~3.0",
"symfony/var-dumper": "~2.8|~3.0",
"symfony/var-dumper": "~2.8.9|~3.0.9|~3.1.3|~3.2",
"symfony/yaml": "~2.8|~3.0"
},
"suggest": {
@ -1470,20 +1470,20 @@
],
"description": "Symfony Twig Bridge",
"homepage": "https://symfony.com",
"time": "2016-06-29 05:41:56"
"time": "2016-07-28 11:13:48"
},
{
"name": "symfony/yaml",
"version": "v3.1.2",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de"
"reference": "1819adf2066880c7967df7180f4f662b6f0567ac"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/2884c26ce4c1d61aebf423a8b912950fe7c764de",
"reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de",
"url": "https://api.github.com/repos/symfony/yaml/zipball/1819adf2066880c7967df7180f4f662b6f0567ac",
"reference": "1819adf2066880c7967df7180f4f662b6f0567ac",
"shasum": ""
},
"require": {
@ -1519,7 +1519,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2016-06-29 05:41:56"
"time": "2016-07-17 14:02:08"
},
{
"name": "twig/twig",
@ -1795,20 +1795,19 @@
},
{
"name": "facebook/webdriver",
"version": "1.1.2",
"version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/facebook/php-webdriver.git",
"reference": "0b889d7de7461439f8a3bbcca46e0f696cb27986"
"reference": "1c98108ba3eb435b681655764de11502a0653705"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/facebook/php-webdriver/zipball/0b889d7de7461439f8a3bbcca46e0f696cb27986",
"reference": "0b889d7de7461439f8a3bbcca46e0f696cb27986",
"url": "https://api.github.com/repos/facebook/php-webdriver/zipball/1c98108ba3eb435b681655764de11502a0653705",
"reference": "1c98108ba3eb435b681655764de11502a0653705",
"shasum": ""
},
"require": {
"ext-curl": "*",
"php": ">=5.3.19"
},
"require-dev": {
@ -1835,7 +1834,7 @@
"selenium",
"webdriver"
],
"time": "2016-06-04 00:02:34"
"time": "2015-12-31 15:58:49"
},
{
"name": "laravel/homestead",
@ -1919,7 +1918,8 @@
"authors": [
{
"name": "Michiel Rook",
"email": "mrook@php.net"
"email": "mrook@php.net",
"role": "Lead"
},
{
"name": "Phing Community",
@ -2443,16 +2443,16 @@
},
{
"name": "phpunit/phpunit",
"version": "4.8.26",
"version": "4.8.27",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "fc1d8cd5b5de11625979125c5639347896ac2c74"
"reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc1d8cd5b5de11625979125c5639347896ac2c74",
"reference": "fc1d8cd5b5de11625979125c5639347896ac2c74",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c062dddcb68e44b563f66ee319ddae2b5a322a90",
"reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90",
"shasum": ""
},
"require": {
@ -2511,7 +2511,7 @@
"testing",
"xunit"
],
"time": "2016-05-17 03:09:28"
"time": "2016-07-21 06:48:14"
},
{
"name": "phpunit/phpunit-mock-objects",
@ -3021,16 +3021,16 @@
},
{
"name": "symfony/browser-kit",
"version": "v3.1.2",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
"reference": "dcf41ed026b0499254385b5c88f03247b2ba010b"
"reference": "d2a07cc11c5fa94820240b1e67592ffb18e347b9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/dcf41ed026b0499254385b5c88f03247b2ba010b",
"reference": "dcf41ed026b0499254385b5c88f03247b2ba010b",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/d2a07cc11c5fa94820240b1e67592ffb18e347b9",
"reference": "d2a07cc11c5fa94820240b1e67592ffb18e347b9",
"shasum": ""
},
"require": {
@ -3074,11 +3074,11 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com",
"time": "2016-06-29 05:41:56"
"time": "2016-07-26 08:04:17"
},
{
"name": "symfony/css-selector",
"version": "v3.1.2",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
@ -3131,16 +3131,16 @@
},
{
"name": "symfony/dom-crawler",
"version": "v3.1.2",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
"reference": "99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0"
"reference": "c7b9b8db3a6f2bac76dcd9a9db5446f2591897f9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0",
"reference": "99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/c7b9b8db3a6f2bac76dcd9a9db5446f2591897f9",
"reference": "c7b9b8db3a6f2bac76dcd9a9db5446f2591897f9",
"shasum": ""
},
"require": {
@ -3183,20 +3183,20 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
"time": "2016-06-29 05:41:56"
"time": "2016-07-26 08:04:17"
},
{
"name": "symfony/process",
"version": "v3.1.2",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "5c11a1a4d4016662eeaf0f8757958c7de069f9a0"
"reference": "04c2dfaae4ec56a5c677b0c69fac34637d815758"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/5c11a1a4d4016662eeaf0f8757958c7de069f9a0",
"reference": "5c11a1a4d4016662eeaf0f8757958c7de069f9a0",
"url": "https://api.github.com/repos/symfony/process/zipball/04c2dfaae4ec56a5c677b0c69fac34637d815758",
"reference": "04c2dfaae4ec56a5c677b0c69fac34637d815758",
"shasum": ""
},
"require": {
@ -3232,7 +3232,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2016-06-29 05:42:25"
"time": "2016-07-28 11:13:48"
},
{
"name": "webmozart/assert",