From 6cf622ae21cc834c0746b552fd5f717e26e320c2 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 18 Jul 2016 18:46:43 +0100 Subject: [PATCH] Updated dependencies --- composer.json | 2 +- composer.lock | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index df48e77dc476..1606c339a5d1 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ "graham-campbell/core": "^5.1", "graham-campbell/exceptions": "^8.6", "graham-campbell/markdown": "^6.1", - "guzzlehttp/guzzle": "^6.2", + "guzzlehttp/guzzle": "^6.2.1", "jenssegers/date": "^3.2", "mccool/laravel-auto-presenter": "^4.3", "pragmarx/google2fa": "^0.7.1", diff --git a/composer.lock b/composer.lock index 8713970745a0..2f6fc9cbd720 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "1e468595f20309ca6658b805a1486282", - "content-hash": "4b3f3e889041139f810c76897b44722a", + "hash": "b9a0ccfa48e2a43140cd4c642e23f515", + "content-hash": "1f7d74d6083194f25a95c7652ddb1a79", "packages": [ { "name": "alt-three/badger", @@ -325,20 +325,20 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.18.28", + "version": "3.18.30", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "c75d3ba185d5db6998124fa1a99a63e5d529b247" + "reference": "fbce85229b913a9e1aded54e464a9bbff0787bf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c75d3ba185d5db6998124fa1a99a63e5d529b247", - "reference": "c75d3ba185d5db6998124fa1a99a63e5d529b247", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fbce85229b913a9e1aded54e464a9bbff0787bf1", + "reference": "fbce85229b913a9e1aded54e464a9bbff0787bf1", "shasum": "" }, "require": { - "guzzlehttp/guzzle": "~5.3|~6.0.1|~6.1", + "guzzlehttp/guzzle": "^5.3.1|^6.2.1", "guzzlehttp/promises": "~1.0", "guzzlehttp/psr7": "~1.3.1", "mtdowling/jmespath.php": "~2.2", @@ -401,7 +401,7 @@ "s3", "sdk" ], - "time": "2016-07-13 20:34:06" + "time": "2016-07-18 16:15:53" }, { "name": "backup-manager/backup-manager", @@ -1646,27 +1646,27 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.2.0", + "version": "6.2.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "d094e337976dff9d8e2424e8485872194e768662" + "reference": "3f808fba627f2c5b69e2501217bf31af349c1427" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d094e337976dff9d8e2424e8485872194e768662", - "reference": "d094e337976dff9d8e2424e8485872194e768662", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/3f808fba627f2c5b69e2501217bf31af349c1427", + "reference": "3f808fba627f2c5b69e2501217bf31af349c1427", "shasum": "" }, "require": { - "guzzlehttp/promises": "~1.0", - "guzzlehttp/psr7": "~1.1", - "php": ">=5.5.0" + "guzzlehttp/promises": "^1.0", + "guzzlehttp/psr7": "^1.3.1", + "php": ">=5.5" }, "require-dev": { "ext-curl": "*", - "phpunit/phpunit": "~4.0", - "psr/log": "~1.0" + "phpunit/phpunit": "^4.0", + "psr/log": "^1.0" }, "type": "library", "extra": { @@ -1704,7 +1704,7 @@ "rest", "web service" ], - "time": "2016-03-21 20:02:09" + "time": "2016-07-15 17:22:37" }, { "name": "guzzlehttp/promises", @@ -2217,16 +2217,16 @@ }, { "name": "league/flysystem", - "version": "1.0.24", + "version": "1.0.25", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "9aca859a303fdca30370f42b8c611d9cf0dedf4b" + "reference": "a76afa4035931be0c78ca8efc6abf3902362f437" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/9aca859a303fdca30370f42b8c611d9cf0dedf4b", - "reference": "9aca859a303fdca30370f42b8c611d9cf0dedf4b", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a76afa4035931be0c78ca8efc6abf3902362f437", + "reference": "a76afa4035931be0c78ca8efc6abf3902362f437", "shasum": "" }, "require": { @@ -2239,7 +2239,7 @@ "ext-fileinfo": "*", "mockery/mockery": "~0.9", "phpspec/phpspec": "^2.2", - "phpunit/phpunit": "~4.8 || ~5.0" + "phpunit/phpunit": "~4.8" }, "suggest": { "ext-fileinfo": "Required for MimeType", @@ -2296,7 +2296,7 @@ "sftp", "storage" ], - "time": "2016-06-03 19:11:39" + "time": "2016-07-18 12:22:57" }, { "name": "mccool/laravel-auto-presenter",