[ticket/14601] Fix composer.lock

PHPBB3-14601
This commit is contained in:
Máté Bartus 2016-04-13 10:52:12 +02:00
parent 3a44ac1690
commit caf63ba86b

220
phpBB/composer.lock generated
View file

@ -4,13 +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"
],
<<<<<<< HEAD
"hash": "e61304256160e9e0c521a4996912d65d",
"content-hash": "64ae8ac9ac0cc8b1f47e58f43e2d7461",
=======
"hash": "b82925c74b2b12ce589973243a9fab68",
"content-hash": "fee6d87604f3053b51c0947ded841cfe",
>>>>>>> 3.2.x
"hash": "aabe5d97d87369a2f21f6e63b0922297",
"content-hash": "cf9ea8c945f6877cbaa8dcbd4ccd6cc3",
"packages": [
{
"name": "bantu/ini-get-wrapper",
@ -471,16 +466,16 @@
},
{
"name": "paragonie/random_compat",
"version": "v1.2.2",
"version": "v1.4.1",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
"reference": "b3313b618f4edd76523572531d5d7e22fe747430"
"reference": "c7e26a21ba357863de030f0b9e701c7d04593774"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/b3313b618f4edd76523572531d5d7e22fe747430",
"reference": "b3313b618f4edd76523572531d5d7e22fe747430",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/c7e26a21ba357863de030f0b9e701c7d04593774",
"reference": "c7e26a21ba357863de030f0b9e701c7d04593774",
"shasum": ""
},
"require": {
@ -515,7 +510,7 @@
"pseudorandom",
"random"
],
"time": "2016-03-11 19:54:08"
"time": "2016-03-18 20:34:03"
},
{
"name": "patchwork/utf8",
@ -608,16 +603,16 @@
},
{
"name": "react/promise",
"version": "v2.2.2",
"version": "v2.4.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/promise.git",
"reference": "3aacad8bf10c7d83e6fa2089d413529888c2bedf"
"reference": "f942da7b505d1a294284ab343d05df42d02ad6d9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/reactphp/promise/zipball/3aacad8bf10c7d83e6fa2089d413529888c2bedf",
"reference": "3aacad8bf10c7d83e6fa2089d413529888c2bedf",
"url": "https://api.github.com/repos/reactphp/promise/zipball/f942da7b505d1a294284ab343d05df42d02ad6d9",
"reference": "f942da7b505d1a294284ab343d05df42d02ad6d9",
"shasum": ""
},
"require": {
@ -648,20 +643,20 @@
}
],
"description": "A lightweight implementation of CommonJS Promises/A for PHP",
"time": "2016-02-26 19:09:02"
"time": "2016-03-31 13:10:33"
},
{
"name": "s9e/text-formatter",
"version": "0.4.11",
"version": "0.4.12",
"source": {
"type": "git",
"url": "https://github.com/s9e/TextFormatter.git",
"reference": "e6dc4615081b1668742076aa05d11aa0f7b00103"
"reference": "7033b824b2ea06046f98420f250d5db84c695288"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/e6dc4615081b1668742076aa05d11aa0f7b00103",
"reference": "e6dc4615081b1668742076aa05d11aa0f7b00103",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/7033b824b2ea06046f98420f250d5db84c695288",
"reference": "7033b824b2ea06046f98420f250d5db84c695288",
"shasum": ""
},
"require": {
@ -708,20 +703,20 @@
"parser",
"shortcodes"
],
"time": "2016-02-21 20:38:42"
"time": "2016-03-20 10:22:44"
},
{
"name": "symfony/config",
"version": "v2.8.3",
"version": "v2.8.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
"reference": "0f8f94e6a32b5c480024eed5fa5cbd2790d0ad19"
"reference": "5273f4724dc5288fe7a33cb08077ab9852621f2c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/config/zipball/0f8f94e6a32b5c480024eed5fa5cbd2790d0ad19",
"reference": "0f8f94e6a32b5c480024eed5fa5cbd2790d0ad19",
"url": "https://api.github.com/repos/symfony/config/zipball/5273f4724dc5288fe7a33cb08077ab9852621f2c",
"reference": "5273f4724dc5288fe7a33cb08077ab9852621f2c",
"shasum": ""
},
"require": {
@ -761,20 +756,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
"time": "2016-02-22 16:12:45"
"time": "2016-03-04 07:54:35"
},
{
"name": "symfony/console",
"version": "v2.8.3",
"version": "v2.8.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "56cc5caf051189720b8de974e4746090aaa10d44"
"reference": "9a5aef5fc0d4eff86853d44202b02be8d5a20154"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/56cc5caf051189720b8de974e4746090aaa10d44",
"reference": "56cc5caf051189720b8de974e4746090aaa10d44",
"url": "https://api.github.com/repos/symfony/console/zipball/9a5aef5fc0d4eff86853d44202b02be8d5a20154",
"reference": "9a5aef5fc0d4eff86853d44202b02be8d5a20154",
"shasum": ""
},
"require": {
@ -821,20 +816,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2016-02-28 16:20:50"
"time": "2016-03-17 09:19:04"
},
{
"name": "symfony/debug",
"version": "v2.8.3",
"version": "v2.8.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "8e255a0c551d443a8159e3da95b5f99997d100fd"
"reference": "056d028521c18f4932c421f1ffa4c74cd644cda8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/8e255a0c551d443a8159e3da95b5f99997d100fd",
"reference": "8e255a0c551d443a8159e3da95b5f99997d100fd",
"url": "https://api.github.com/repos/symfony/debug/zipball/056d028521c18f4932c421f1ffa4c74cd644cda8",
"reference": "056d028521c18f4932c421f1ffa4c74cd644cda8",
"shasum": ""
},
"require": {
@ -878,20 +873,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2016-01-27 05:14:19"
"time": "2016-03-16 15:31:59"
},
{
"name": "symfony/dependency-injection",
"version": "v2.8.3",
"version": "v2.8.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
"reference": "62251761a7615435b22ccf562384c588b431be44"
"reference": "f7b4a498e679fa440b16facb934680a1527ed48c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/62251761a7615435b22ccf562384c588b431be44",
"reference": "62251761a7615435b22ccf562384c588b431be44",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f7b4a498e679fa440b16facb934680a1527ed48c",
"reference": "f7b4a498e679fa440b16facb934680a1527ed48c",
"shasum": ""
},
"require": {
@ -940,20 +935,20 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
"time": "2016-02-28 16:34:46"
"time": "2016-03-21 07:27:21"
},
{
"name": "symfony/event-dispatcher",
"version": "v2.8.3",
"version": "v2.8.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "78c468665c9568c3faaa9c416a7134308f2d85c3"
"reference": "47d2d8cade9b1c3987573d2943bb9352536cdb87"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/78c468665c9568c3faaa9c416a7134308f2d85c3",
"reference": "78c468665c9568c3faaa9c416a7134308f2d85c3",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/47d2d8cade9b1c3987573d2943bb9352536cdb87",
"reference": "47d2d8cade9b1c3987573d2943bb9352536cdb87",
"shasum": ""
},
"require": {
@ -1000,20 +995,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2016-01-27 05:14:19"
"time": "2016-03-07 14:04:32"
},
{
"name": "symfony/filesystem",
"version": "v2.8.3",
"version": "v2.8.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "65cb36b6539b1d446527d60457248f30d045464d"
"reference": "f08ffdf229252cd2745558cb2112df43903bcae4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/65cb36b6539b1d446527d60457248f30d045464d",
"reference": "65cb36b6539b1d446527d60457248f30d045464d",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/f08ffdf229252cd2745558cb2112df43903bcae4",
"reference": "f08ffdf229252cd2745558cb2112df43903bcae4",
"shasum": ""
},
"require": {
@ -1049,20 +1044,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
"time": "2016-02-22 15:02:30"
"time": "2016-03-27 10:20:16"
},
{
"name": "symfony/finder",
"version": "v2.8.3",
"version": "v2.8.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "877bb4b16ea573cc8c024e9590888fcf7eb7e0f7"
"reference": "ca24cf2cd4e3826f571e0067e535758e73807aa1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/877bb4b16ea573cc8c024e9590888fcf7eb7e0f7",
"reference": "877bb4b16ea573cc8c024e9590888fcf7eb7e0f7",
"url": "https://api.github.com/repos/symfony/finder/zipball/ca24cf2cd4e3826f571e0067e535758e73807aa1",
"reference": "ca24cf2cd4e3826f571e0067e535758e73807aa1",
"shasum": ""
},
"require": {
@ -1098,24 +1093,25 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"time": "2016-02-22 16:12:45"
"time": "2016-03-10 10:53:53"
},
{
"name": "symfony/http-foundation",
"version": "v2.8.3",
"version": "v2.8.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "6f4e41c41e7d352ed9adf71ff6f2ec1756490a1b"
"reference": "06d6b2c755b2f34ce21e688b62072e9c625709c4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/6f4e41c41e7d352ed9adf71ff6f2ec1756490a1b",
"reference": "6f4e41c41e7d352ed9adf71ff6f2ec1756490a1b",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/06d6b2c755b2f34ce21e688b62072e9c625709c4",
"reference": "06d6b2c755b2f34ce21e688b62072e9c625709c4",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
"symfony/polyfill-mbstring": "~1.1",
"symfony/polyfill-php54": "~1.0",
"symfony/polyfill-php55": "~1.0"
},
@ -1152,20 +1148,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"time": "2016-02-28 16:20:50"
"time": "2016-03-27 12:57:53"
},
{
"name": "symfony/http-kernel",
"version": "v2.8.3",
"version": "v2.8.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "67ca6a98d8d7cf243ccb4b716deab2342f409a4d"
"reference": "2c45576fee2eb228d4771342a05b0565e4711ba2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/67ca6a98d8d7cf243ccb4b716deab2342f409a4d",
"reference": "67ca6a98d8d7cf243ccb4b716deab2342f409a4d",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/2c45576fee2eb228d4771342a05b0565e4711ba2",
"reference": "2c45576fee2eb228d4771342a05b0565e4711ba2",
"shasum": ""
},
"require": {
@ -1234,7 +1230,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
"time": "2016-02-28 21:06:17"
"time": "2016-03-25 01:40:30"
},
{
"name": "symfony/polyfill-mbstring",
@ -1465,16 +1461,16 @@
},
{
"name": "symfony/routing",
"version": "v2.8.3",
"version": "v2.8.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "ae38e64bae52753c0f4a1a6583f5ba9bb2b742ab"
"reference": "d7d4a20cb55a90a06c0070d1a360e5ac606306ef"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/ae38e64bae52753c0f4a1a6583f5ba9bb2b742ab",
"reference": "ae38e64bae52753c0f4a1a6583f5ba9bb2b742ab",
"url": "https://api.github.com/repos/symfony/routing/zipball/d7d4a20cb55a90a06c0070d1a360e5ac606306ef",
"reference": "d7d4a20cb55a90a06c0070d1a360e5ac606306ef",
"shasum": ""
},
"require": {
@ -1536,20 +1532,20 @@
"uri",
"url"
],
"time": "2016-02-04 13:53:00"
"time": "2016-03-23 13:11:46"
},
{
"name": "symfony/twig-bridge",
"version": "v2.8.3",
"version": "v2.8.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/twig-bridge.git",
"reference": "ba898e4714734948dc00c4d776e1d6be165ff8c4"
"reference": "11326178aea4aceb99f72c8ff0cac32d668309c7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/twig-bridge/zipball/ba898e4714734948dc00c4d776e1d6be165ff8c4",
"reference": "ba898e4714734948dc00c4d776e1d6be165ff8c4",
"url": "https://api.github.com/repos/symfony/twig-bridge/zipball/11326178aea4aceb99f72c8ff0cac32d668309c7",
"reference": "11326178aea4aceb99f72c8ff0cac32d668309c7",
"shasum": ""
},
"require": {
@ -1561,7 +1557,7 @@
"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",
"symfony/form": "~2.8.4",
"symfony/http-kernel": "~2.8|~3.0.0",
"symfony/polyfill-intl-icu": "~1.0",
"symfony/routing": "~2.2|~3.0.0",
@ -1617,20 +1613,20 @@
],
"description": "Symfony Twig Bridge",
"homepage": "https://symfony.com",
"time": "2016-02-22 15:02:30"
"time": "2016-03-25 18:30:27"
},
{
"name": "symfony/yaml",
"version": "v2.8.3",
"version": "v2.8.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "2a4ee40acb880c56f29fb1b8886e7ffe94f3b995"
"reference": "584e52cb8f788a887553ba82db6caacb1d6260bb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/2a4ee40acb880c56f29fb1b8886e7ffe94f3b995",
"reference": "2a4ee40acb880c56f29fb1b8886e7ffe94f3b995",
"url": "https://api.github.com/repos/symfony/yaml/zipball/584e52cb8f788a887553ba82db6caacb1d6260bb",
"reference": "584e52cb8f788a887553ba82db6caacb1d6260bb",
"shasum": ""
},
"require": {
@ -1666,7 +1662,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2016-02-23 07:41:20"
"time": "2016-03-04 07:54:35"
},
{
"name": "twig/twig",
@ -2109,7 +2105,8 @@
"authors": [
{
"name": "Michiel Rook",
"email": "mrook@php.net"
"email": "mrook@php.net",
"role": "Lead"
},
{
"name": "Phing Community",
@ -2588,9 +2585,7 @@
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
"email": "fabien@symfony.com"
}
],
"description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
@ -2980,19 +2975,20 @@
},
{
"name": "squizlabs/php_codesniffer",
"version": "2.5.1",
"version": "2.6.0",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "6731851d6aaf1d0d6c58feff1065227b7fda3ba8"
"reference": "1bcdf03b068a530ac1962ce671dead356eeba43b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6731851d6aaf1d0d6c58feff1065227b7fda3ba8",
"reference": "6731851d6aaf1d0d6c58feff1065227b7fda3ba8",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1bcdf03b068a530ac1962ce671dead356eeba43b",
"reference": "1bcdf03b068a530ac1962ce671dead356eeba43b",
"shasum": ""
},
"require": {
"ext-simplexml": "*",
"ext-tokenizer": "*",
"ext-xmlwriter": "*",
"php": ">=5.1.2"
@ -3053,20 +3049,20 @@
"phpcs",
"standards"
],
"time": "2016-01-19 23:39:10"
"time": "2016-04-03 22:58:34"
},
{
"name": "symfony/browser-kit",
"version": "v2.8.3",
"version": "v2.8.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
"reference": "6b2085020b4e86fcb7ae44c3ab8ddb91774b33d2"
"reference": "745c19467255cf32eaf311f000eecafd83ca5586"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/6b2085020b4e86fcb7ae44c3ab8ddb91774b33d2",
"reference": "6b2085020b4e86fcb7ae44c3ab8ddb91774b33d2",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/745c19467255cf32eaf311f000eecafd83ca5586",
"reference": "745c19467255cf32eaf311f000eecafd83ca5586",
"shasum": ""
},
"require": {
@ -3110,20 +3106,20 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com",
"time": "2016-01-27 11:34:40"
"time": "2016-03-04 07:54:35"
},
{
"name": "symfony/css-selector",
"version": "v2.8.3",
"version": "v2.8.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "8d83ff9777cdbd83e7f90d9c48f4729823791a5e"
"reference": "07b7ced3ae0c12918477c095453ea8595000810e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/8d83ff9777cdbd83e7f90d9c48f4729823791a5e",
"reference": "8d83ff9777cdbd83e7f90d9c48f4729823791a5e",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/07b7ced3ae0c12918477c095453ea8595000810e",
"reference": "07b7ced3ae0c12918477c095453ea8595000810e",
"shasum": ""
},
"require": {
@ -3163,20 +3159,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
"time": "2016-01-27 05:14:19"
"time": "2016-03-04 07:54:35"
},
{
"name": "symfony/dom-crawler",
"version": "v2.8.3",
"version": "v2.8.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
"reference": "e1a4b4c83f5ee6f5902f1d53035e3718909a0c11"
"reference": "aae5c37d243c6ec11db62221aaff37e7f8005926"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/e1a4b4c83f5ee6f5902f1d53035e3718909a0c11",
"reference": "e1a4b4c83f5ee6f5902f1d53035e3718909a0c11",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/aae5c37d243c6ec11db62221aaff37e7f8005926",
"reference": "aae5c37d243c6ec11db62221aaff37e7f8005926",
"shasum": ""
},
"require": {
@ -3219,20 +3215,20 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
"time": "2016-02-28 16:20:50"
"time": "2016-03-23 13:11:46"
},
{
"name": "symfony/process",
"version": "v2.8.3",
"version": "v2.8.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "7dedd5b60550f33dca16dd7e94ef8aca8b67bbfe"
"reference": "fb467471952ef5cf8497c029980e556b47545333"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/7dedd5b60550f33dca16dd7e94ef8aca8b67bbfe",
"reference": "7dedd5b60550f33dca16dd7e94ef8aca8b67bbfe",
"url": "https://api.github.com/repos/symfony/process/zipball/fb467471952ef5cf8497c029980e556b47545333",
"reference": "fb467471952ef5cf8497c029980e556b47545333",
"shasum": ""
},
"require": {
@ -3268,7 +3264,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2016-02-02 13:33:15"
"time": "2016-03-23 13:11:46"
}
],
"aliases": [],