From 0648bbffa20b63fcb2d4ac5aa6c6e0e08834a3ba Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Mon, 15 Dec 2014 11:50:37 +1300
Subject: [PATCH] Updated composer after merge
---
composer.lock | 329 +++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 274 insertions(+), 55 deletions(-)
diff --git a/composer.lock b/composer.lock
index fdddc728f8..12cb16dd69 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "92499fc432a629fefcd5c1b912e44d9c",
+ "hash": "ed64c8df41ea550e2c0b78424573310e",
"packages": [
{
"name": "container-interop/container-interop",
@@ -354,6 +354,78 @@
],
"time": "2014-08-21 08:20:45"
},
+ {
+ "name": "monolog/monolog",
+ "version": "1.11.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Seldaek/monolog.git",
+ "reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/ec3961874c43840e96da3a8a1ed20d8c73d7e5aa",
+ "reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0",
+ "psr/log": "~1.0"
+ },
+ "provide": {
+ "psr/log-implementation": "1.0.0"
+ },
+ "require-dev": {
+ "aws/aws-sdk-php": "~2.4, >2.4.8",
+ "doctrine/couchdb": "~1.0@dev",
+ "graylog2/gelf-php": "~1.0",
+ "phpunit/phpunit": "~3.7.0",
+ "raven/raven": "~0.5",
+ "ruflin/elastica": "0.90.*",
+ "videlalvaro/php-amqplib": "~2.4"
+ },
+ "suggest": {
+ "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
+ "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
+ "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
+ "ext-mongo": "Allow sending log messages to a MongoDB server",
+ "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
+ "raven/raven": "Allow sending log messages to a Sentry server",
+ "rollbar/rollbar": "Allow sending log messages to Rollbar",
+ "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
+ "videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.11.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Monolog\\": "src/Monolog"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be"
+ }
+ ],
+ "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
+ "homepage": "http://github.com/Seldaek/monolog",
+ "keywords": [
+ "log",
+ "logging",
+ "psr-3"
+ ],
+ "time": "2014-09-30 13:30:58"
+ },
{
"name": "mustangostang/spyc",
"version": "0.5.1",
@@ -546,19 +618,57 @@
],
"time": "2014-10-23 03:30:23"
},
+ {
+ "name": "psr/log",
+ "version": "1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/log.git",
+ "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
+ "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+ "shasum": ""
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "Psr\\Log\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for logging libraries",
+ "keywords": [
+ "log",
+ "psr",
+ "psr-3"
+ ],
+ "time": "2012-12-21 11:40:51"
+ },
{
"name": "symfony/console",
- "version": "v2.5.6",
+ "version": "v2.6.1",
"target-dir": "Symfony/Component/Console",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console.git",
- "reference": "6f177fca24200a5b97aef5ce7a5c98124a0f0db0"
+ "reference": "ef825fd9f809d275926547c9e57cbf14968793e8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Console/zipball/6f177fca24200a5b97aef5ce7a5c98124a0f0db0",
- "reference": "6f177fca24200a5b97aef5ce7a5c98124a0f0db0",
+ "url": "https://api.github.com/repos/symfony/Console/zipball/ef825fd9f809d275926547c9e57cbf14968793e8",
+ "reference": "ef825fd9f809d275926547c9e57cbf14968793e8",
"shasum": ""
},
"require": {
@@ -566,16 +676,18 @@
},
"require-dev": {
"psr/log": "~1.0",
- "symfony/event-dispatcher": "~2.1"
+ "symfony/event-dispatcher": "~2.1",
+ "symfony/process": "~2.1"
},
"suggest": {
"psr/log": "For using the console logger",
- "symfony/event-dispatcher": ""
+ "symfony/event-dispatcher": "",
+ "symfony/process": ""
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -599,7 +711,65 @@
],
"description": "Symfony Console Component",
"homepage": "http://symfony.com",
- "time": "2014-10-05 13:57:04"
+ "time": "2014-12-02 20:19:20"
+ },
+ {
+ "name": "symfony/monolog-bridge",
+ "version": "v2.6.1",
+ "target-dir": "Symfony/Bridge/Monolog",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/MonologBridge.git",
+ "reference": "98a8debb952b8a7e0fff31fbce0f5e965dc1f499"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/MonologBridge/zipball/98a8debb952b8a7e0fff31fbce0f5e965dc1f499",
+ "reference": "98a8debb952b8a7e0fff31fbce0f5e965dc1f499",
+ "shasum": ""
+ },
+ "require": {
+ "monolog/monolog": "~1.11",
+ "php": ">=5.3.3"
+ },
+ "require-dev": {
+ "symfony/console": "~2.3",
+ "symfony/event-dispatcher": "~2.2",
+ "symfony/http-kernel": "~2.2"
+ },
+ "suggest": {
+ "symfony/console": "For the possibility to show log messages in console commands depending on verbosity settings. You need version ~2.3 of the console for it.",
+ "symfony/event-dispatcher": "Needed when using log messages in console commands",
+ "symfony/http-kernel": "For using the debugging handlers together with the response life cycle of the HTTP kernel."
+ },
+ "type": "symfony-bridge",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.6-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Symfony\\Bridge\\Monolog\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Symfony Community",
+ "homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ }
+ ],
+ "description": "Symfony Monolog Bridge",
+ "homepage": "http://symfony.com",
+ "time": "2014-12-02 20:19:20"
},
{
"name": "tedivm/jshrink",
@@ -945,16 +1115,16 @@
},
{
"name": "phpseclib/phpseclib",
- "version": "0.3.8",
+ "version": "0.3.9",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "5085202f1f37769aae59f9711c423f28159c9b29"
+ "reference": "c6e88ca6e81bc5a2d7161658e16a95b7ef8d6ad1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/5085202f1f37769aae59f9711c423f28159c9b29",
- "reference": "5085202f1f37769aae59f9711c423f28159c9b29",
+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c6e88ca6e81bc5a2d7161658e16a95b7ef8d6ad1",
+ "reference": "c6e88ca6e81bc5a2d7161658e16a95b7ef8d6ad1",
"shasum": ""
},
"require": {
@@ -1039,20 +1209,20 @@
"x.509",
"x509"
],
- "time": "2014-09-13 02:42:45"
+ "time": "2014-11-10 03:08:59"
},
{
"name": "phpunit/php-code-coverage",
- "version": "2.0.11",
+ "version": "2.0.13",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "53603b3c995f5aab6b59c8e08c3a663d2cc810b7"
+ "reference": "0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/53603b3c995f5aab6b59c8e08c3a663d2cc810b7",
- "reference": "53603b3c995f5aab6b59c8e08c3a663d2cc810b7",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5",
+ "reference": "0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5",
"shasum": ""
},
"require": {
@@ -1104,7 +1274,7 @@
"testing",
"xunit"
],
- "time": "2014-08-31 06:33:04"
+ "time": "2014-12-03 06:41:44"
},
{
"name": "phpunit/php-file-iterator",
@@ -1290,16 +1460,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "4.3.4",
+ "version": "4.4.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "23e4e0310f037aae873cc81b8658dbbb82878f71"
+ "reference": "bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/23e4e0310f037aae873cc81b8658dbbb82878f71",
- "reference": "23e4e0310f037aae873cc81b8658dbbb82878f71",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0",
+ "reference": "bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0",
"shasum": ""
},
"require": {
@@ -1316,8 +1486,9 @@
"phpunit/phpunit-mock-objects": "~2.3",
"sebastian/comparator": "~1.0",
"sebastian/diff": "~1.1",
- "sebastian/environment": "~1.0",
+ "sebastian/environment": "~1.1",
"sebastian/exporter": "~1.0",
+ "sebastian/global-state": "~1.0",
"sebastian/version": "~1.0",
"symfony/yaml": "~2.0"
},
@@ -1330,7 +1501,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3.x-dev"
+ "dev-master": "4.4.x-dev"
}
},
"autoload": {
@@ -1339,10 +1510,6 @@
]
},
"notification-url": "https://packagist.org/downloads/",
- "include-path": [
- "",
- "../../symfony/yaml/"
- ],
"license": [
"BSD-3-Clause"
],
@@ -1354,13 +1521,13 @@
}
],
"description": "The PHP Unit Testing framework.",
- "homepage": "http://www.phpunit.de/",
+ "homepage": "https://phpunit.de/",
"keywords": [
"phpunit",
"testing",
"xunit"
],
- "time": "2014-10-22 11:43:12"
+ "time": "2014-12-05 06:49:03"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -1419,16 +1586,16 @@
},
{
"name": "sebastian/comparator",
- "version": "1.0.1",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "e54a01c0da1b87db3c5a3c4c5277ddf331da4aef"
+ "reference": "c484a80f97573ab934e37826dba0135a3301b26a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/e54a01c0da1b87db3c5a3c4c5277ddf331da4aef",
- "reference": "e54a01c0da1b87db3c5a3c4c5277ddf331da4aef",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/c484a80f97573ab934e37826dba0135a3301b26a",
+ "reference": "c484a80f97573ab934e37826dba0135a3301b26a",
"shasum": ""
},
"require": {
@@ -1442,7 +1609,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.1.x-dev"
}
},
"autoload": {
@@ -1479,7 +1646,7 @@
"compare",
"equality"
],
- "time": "2014-05-11 23:00:21"
+ "time": "2014-11-16 21:32:38"
},
{
"name": "sebastian/diff",
@@ -1535,16 +1702,16 @@
},
{
"name": "sebastian/environment",
- "version": "1.2.0",
+ "version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "0d9bf79554d2a999da194a60416c15cf461eb67d"
+ "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/0d9bf79554d2a999da194a60416c15cf461eb67d",
- "reference": "0d9bf79554d2a999da194a60416c15cf461eb67d",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e6c71d918088c251b181ba8b3088af4ac336dd7",
+ "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7",
"shasum": ""
},
"require": {
@@ -1581,7 +1748,7 @@
"environment",
"hhvm"
],
- "time": "2014-10-22 06:38:05"
+ "time": "2014-10-25 08:00:45"
},
{
"name": "sebastian/exporter",
@@ -1648,6 +1815,57 @@
],
"time": "2014-09-10 00:51:36"
},
+ {
+ "name": "sebastian/global-state",
+ "version": "1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/global-state.git",
+ "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+ "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.2"
+ },
+ "suggest": {
+ "ext-uopz": "*"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ }
+ ],
+ "description": "Snapshotting of global state",
+ "homepage": "http://www.github.com/sebastianbergmann/global-state",
+ "keywords": [
+ "global state"
+ ],
+ "time": "2014-10-06 09:23:50"
+ },
{
"name": "sebastian/version",
"version": "1.0.3",
@@ -1685,17 +1903,17 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.5.6",
+ "version": "v2.6.1",
"target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
"url": "https://github.com/symfony/EventDispatcher.git",
- "reference": "804eb28dbbfba9ffdab21fe2066744906cea2212"
+ "reference": "720fe9bca893df7ad1b4546649473b5afddf0216"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/804eb28dbbfba9ffdab21fe2066744906cea2212",
- "reference": "804eb28dbbfba9ffdab21fe2066744906cea2212",
+ "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/720fe9bca893df7ad1b4546649473b5afddf0216",
+ "reference": "720fe9bca893df7ad1b4546649473b5afddf0216",
"shasum": ""
},
"require": {
@@ -1704,7 +1922,8 @@
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~2.0",
- "symfony/dependency-injection": "~2.0,<2.6.0",
+ "symfony/dependency-injection": "~2.6",
+ "symfony/expression-language": "~2.6",
"symfony/stopwatch": "~2.2"
},
"suggest": {
@@ -1714,7 +1933,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -1738,21 +1957,21 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com",
- "time": "2014-10-01 15:43:05"
+ "time": "2014-12-02 20:19:20"
},
{
"name": "symfony/yaml",
- "version": "v2.5.6",
+ "version": "v2.6.1",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
- "reference": "2d9f527449cabfa8543dd7fa3a466d6ae83d6726"
+ "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/2d9f527449cabfa8543dd7fa3a466d6ae83d6726",
- "reference": "2d9f527449cabfa8543dd7fa3a466d6ae83d6726",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/3346fc090a3eb6b53d408db2903b241af51dcb20",
+ "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20",
"shasum": ""
},
"require": {
@@ -1761,7 +1980,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -1785,7 +2004,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com",
- "time": "2014-10-01 05:50:18"
+ "time": "2014-12-02 20:19:20"
}
],
"aliases": [],
--
GitLab