From 3801c911096d4a7a775cc3f979849fe3ed3835c0 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Tue, 6 Jan 2015 16:54:47 +1300
Subject: [PATCH] ran composer update (after all it seemed travis started
getting slow since yesterday independantly of this commit)
---
composer.lock | 73 +++++++++++++++++++++++++++------------------------
1 file changed, 38 insertions(+), 35 deletions(-)
diff --git a/composer.lock b/composer.lock
index a368b01a5d..34d220b432 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
"packages": [
{
"name": "container-interop/container-interop",
- "version": "1.0.0",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/container-interop/container-interop.git",
- "reference": "b4274c871bfd1ae8d8e527ba11734f4df1573e48"
+ "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/container-interop/container-interop/zipball/b4274c871bfd1ae8d8e527ba11734f4df1573e48",
- "reference": "b4274c871bfd1ae8d8e527ba11734f4df1573e48",
+ "url": "https://api.github.com/repos/container-interop/container-interop/zipball/fc08354828f8fd3245f77a66b9e23a6bca48297e",
+ "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e",
"shasum": ""
},
"type": "library",
@@ -31,7 +31,7 @@
"MIT"
],
"description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
- "time": "2014-03-16 14:50:05"
+ "time": "2014-12-30 15:22:37"
},
{
"name": "doctrine/annotations",
@@ -166,22 +166,27 @@
},
{
"name": "doctrine/lexer",
- "version": "v1.0",
+ "version": "v1.0.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/lexer.git",
- "reference": "2f708a85bb3aab5d99dab8be435abd73e0b18acb"
+ "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/lexer/zipball/2f708a85bb3aab5d99dab8be435abd73e0b18acb",
- "reference": "2f708a85bb3aab5d99dab8be435abd73e0b18acb",
+ "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
+ "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
"shasum": ""
},
"require": {
"php": ">=5.3.2"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
"autoload": {
"psr-0": {
"Doctrine\\Common\\Lexer\\": "lib/"
@@ -192,20 +197,17 @@
"MIT"
],
"authors": [
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com",
- "homepage": "http://www.instaclick.com"
- },
{
"name": "Roman Borschel",
"email": "roman@code-factory.org"
},
+ {
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
{
"name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com",
- "homepage": "https://github.com/schmittjoh",
- "role": "Developer of wrapped JMSSerializerBundle"
+ "email": "schmittjoh@gmail.com"
}
],
"description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
@@ -214,7 +216,7 @@
"lexer",
"parser"
],
- "time": "2013-01-12 18:59:04"
+ "time": "2014-09-09 13:34:57"
},
{
"name": "leafo/lessphp",
@@ -350,16 +352,16 @@
},
{
"name": "monolog/monolog",
- "version": "1.11.0",
+ "version": "1.12.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa"
+ "reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/ec3961874c43840e96da3a8a1ed20d8c73d7e5aa",
- "reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1fbe8c2641f2b163addf49cc5e18f144bec6b19f",
+ "reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f",
"shasum": ""
},
"require": {
@@ -373,7 +375,7 @@
"aws/aws-sdk-php": "~2.4, >2.4.8",
"doctrine/couchdb": "~1.0@dev",
"graylog2/gelf-php": "~1.0",
- "phpunit/phpunit": "~3.7.0",
+ "phpunit/phpunit": "~4.0",
"raven/raven": "~0.5",
"ruflin/elastica": "0.90.*",
"videlalvaro/php-amqplib": "~2.4"
@@ -392,7 +394,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.11.x-dev"
+ "dev-master": "1.12.x-dev"
}
},
"autoload": {
@@ -418,7 +420,7 @@
"logging",
"psr-3"
],
- "time": "2014-09-30 13:30:58"
+ "time": "2014-12-29 21:29:35"
},
{
"name": "mustangostang/spyc",
@@ -500,16 +502,16 @@
},
{
"name": "piwik/cache",
- "version": "0.2.3",
+ "version": "0.2.4",
"source": {
"type": "git",
"url": "https://github.com/piwik/component-cache.git",
- "reference": "a08383ef0824bedb193c26393a83904355f94543"
+ "reference": "ec118c1d8b20197607052b8adb22f3a7709cb816"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/piwik/component-cache/zipball/a08383ef0824bedb193c26393a83904355f94543",
- "reference": "a08383ef0824bedb193c26393a83904355f94543",
+ "url": "https://api.github.com/repos/piwik/component-cache/zipball/ec118c1d8b20197607052b8adb22f3a7709cb816",
+ "reference": "ec118c1d8b20197607052b8adb22f3a7709cb816",
"shasum": ""
},
"require": {
@@ -543,7 +545,7 @@
"file",
"redis"
],
- "time": "2014-12-29 00:00:08"
+ "time": "2015-01-05 04:44:36"
},
{
"name": "piwik/decompress",
@@ -1967,16 +1969,16 @@
},
{
"name": "sebastian/version",
- "version": "1.0.3",
+ "version": "1.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/version.git",
- "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43"
+ "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
- "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
+ "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/a77d9123f8e809db3fbdea15038c27a95da4058b",
+ "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b",
"shasum": ""
},
"type": "library",
@@ -1998,7 +2000,7 @@
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version",
- "time": "2014-03-07 15:35:33"
+ "time": "2014-12-15 14:25:24"
},
{
"name": "symfony/var-dumper",
@@ -2116,6 +2118,7 @@
"facebook/xhprof": 20
},
"prefer-stable": false,
+ "prefer-lowest": false,
"platform": {
"php": ">=5.3.3"
},
--
GitLab