From 159390f98952801dd68bf7f77ac046f3a6233319 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 18 Apr 2016 18:28:49 +0100 Subject: [PATCH] Updated deps --- composer.json | 2 +- composer.lock | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index ce167093..bfd0cb49 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ ], "require": { "php": ">=5.5.9", - "laravel/framework": "~5.2.26", + "laravel/framework": "~5.2.30", "alt-three/badger": "^3.0", "alt-three/bus": "^1.0", "alt-three/emoji": "^3.0", diff --git a/composer.lock b/composer.lock index 901081b9..4b74bc1c 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": "eecd7b14139ec52c478d6b36497570fb", - "content-hash": "d40623b812ddc6c708e56438457d2adb", + "hash": "a14ab9a0890f81633658517822f88207", + "content-hash": "dd1a2ca8d28210dce24ed73872fd2449", "packages": [ { "name": "alt-three/badger", @@ -1703,16 +1703,16 @@ }, { "name": "laravel/framework", - "version": "v5.2.29", + "version": "5.2.x-dev", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "e3d644eb131f18c5f3d28ff7bc678bc797091f20" + "reference": "a37f3cc2fb7e8f4ead37ad1966cdd5fee1b2d0ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/e3d644eb131f18c5f3d28ff7bc678bc797091f20", - "reference": "e3d644eb131f18c5f3d28ff7bc678bc797091f20", + "url": "https://api.github.com/repos/laravel/framework/zipball/a37f3cc2fb7e8f4ead37ad1966cdd5fee1b2d0ad", + "reference": "a37f3cc2fb7e8f4ead37ad1966cdd5fee1b2d0ad", "shasum": "" }, "require": { @@ -1773,7 +1773,7 @@ }, "require-dev": { "aws/aws-sdk-php": "~3.0", - "mockery/mockery": "~0.9.2", + "mockery/mockery": "~0.9.4", "pda/pheanstalk": "~3.0", "phpunit/phpunit": "~4.1", "predis/predis": "~1.0", @@ -1791,7 +1791,8 @@ "predis/predis": "Required to use the redis cache and queue drivers (~1.0).", "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).", "symfony/css-selector": "Required to use some of the crawler integration testing tools (2.8.*|3.0.*).", - "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (2.8.*|3.0.*)." + "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (2.8.*|3.0.*).", + "symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)." }, "type": "library", "extra": { @@ -1827,7 +1828,7 @@ "framework", "laravel" ], - "time": "2016-04-03 01:43:55" + "time": "2016-04-18 14:42:00" }, { "name": "league/commonmark",