Merge branch '2.3' into 2.4

2016-07-18 19:38:10 +01:00
parent bcbbee22d9 f8505a866d
commit 0d90f0459b
2 changed files with 25 additions and 25 deletions
--- 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",
--- 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": "26bf01769eeb76c611500fbca9149683",
-    "content-hash": "f71c593ddc593fb0a0848fbe0248a4a2",
+    "hash": "2ec8c8e4e82b0c9ca40e10b064f885f4",
+    "content-hash": "e29d95a0f902ce2be0aeb2f09b8abc46",
    "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",