diff --git a/composer.lock b/composer.lock index 55a460710..5259c4248 100644 --- a/composer.lock +++ b/composer.lock @@ -1872,21 +1872,24 @@ }, { "name": "league/flysystem", - "version": "1.0.12", + "version": "1.0.13", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "7323424a9d39c24e597ed3f2144419dfbb52e086" + "reference": "76caed01a57527599b55919f0746104f288b3d56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7323424a9d39c24e597ed3f2144419dfbb52e086", - "reference": "7323424a9d39c24e597ed3f2144419dfbb52e086", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/76caed01a57527599b55919f0746104f288b3d56", + "reference": "76caed01a57527599b55919f0746104f288b3d56", "shasum": "" }, "require": { "php": ">=5.4.0" }, + "conflict": { + "league/flysystem-sftp": "<1.0.6" + }, "require-dev": { "ext-fileinfo": "*", "mockery/mockery": "~0.9", @@ -1949,7 +1952,7 @@ "sftp", "storage" ], - "time": "2015-09-05 12:06:41" + "time": "2015-09-20 13:05:34" }, { "name": "mccool/laravel-auto-presenter", @@ -2180,16 +2183,16 @@ }, { "name": "nikic/php-parser", - "version": "v1.4.0", + "version": "v1.4.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "196f177cfefa0f1f7166c0a05d8255889be12418" + "reference": "f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/196f177cfefa0f1f7166c0a05d8255889be12418", - "reference": "196f177cfefa0f1f7166c0a05d8255889be12418", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51", + "reference": "f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51", "shasum": "" }, "require": { @@ -2221,7 +2224,7 @@ "parser", "php" ], - "time": "2015-07-14 17:31:05" + "time": "2015-09-19 14:15:08" }, { "name": "pragmarx/google2fa", @@ -3851,16 +3854,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.8.7", + "version": "4.8.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "dab2ada9e9a503d2ec3c32fe0fb59dea9bdd9dfa" + "reference": "521720279261e5b14799cf1bb895d4b55e516f26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/dab2ada9e9a503d2ec3c32fe0fb59dea9bdd9dfa", - "reference": "dab2ada9e9a503d2ec3c32fe0fb59dea9bdd9dfa", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/521720279261e5b14799cf1bb895d4b55e516f26", + "reference": "521720279261e5b14799cf1bb895d4b55e516f26", "shasum": "" }, "require": { @@ -3919,7 +3922,7 @@ "testing", "xunit" ], - "time": "2015-09-14 06:57:22" + "time": "2015-09-19 05:44:37" }, { "name": "phpunit/phpunit-mock-objects",