Merge pull request #1318 from CachetHQ/update

Updated dependencies
This commit is contained in:
Graham Campbell
2015-12-31 23:08:38 +00:00

28
composer.lock generated
View File

@@ -543,33 +543,33 @@
},
{
"name": "doctrine/cache",
"version": "v1.5.4",
"version": "v1.6.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
"reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136"
"reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/47cdc76ceb95cc591d9c79a36dc3794975b5d136",
"reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136",
"url": "https://api.github.com/repos/doctrine/cache/zipball/f8af318d14bdb0eff0336795b428b547bd39ccb6",
"reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6",
"shasum": ""
},
"require": {
"php": ">=5.3.2"
"php": "~5.5|~7.0"
},
"conflict": {
"doctrine/common": ">2.2,<2.4"
},
"require-dev": {
"phpunit/phpunit": ">=3.7",
"phpunit/phpunit": "~4.8|~5.0",
"predis/predis": "~1.0",
"satooshi/php-coveralls": "~0.6"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.5.x-dev"
"dev-master": "1.6.x-dev"
}
},
"autoload": {
@@ -609,7 +609,7 @@
"cache",
"caching"
],
"time": "2015-12-19 05:03:47"
"time": "2015-12-31 16:37:02"
},
{
"name": "doctrine/collections",
@@ -1739,16 +1739,16 @@
},
{
"name": "laravel/framework",
"version": "5.2.x-dev",
"version": "v5.2.6",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "c4d609c75ae88813b624644911984d5bdf6200fb"
"reference": "b774c304ee81fcf5402fa06b261b364ba8f29cf0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/c4d609c75ae88813b624644911984d5bdf6200fb",
"reference": "c4d609c75ae88813b624644911984d5bdf6200fb",
"url": "https://api.github.com/repos/laravel/framework/zipball/b774c304ee81fcf5402fa06b261b364ba8f29cf0",
"reference": "b774c304ee81fcf5402fa06b261b364ba8f29cf0",
"shasum": ""
},
"require": {
@@ -1863,7 +1863,7 @@
"framework",
"laravel"
],
"time": "2015-12-30 14:19:10"
"time": "2015-12-31 17:41:58"
},
{
"name": "league/commonmark",
@@ -3882,7 +3882,7 @@
],
"authors": [
{
"name": "François Zaninotto"
"name": "Francois Zaninotto"
}
],
"description": "Faker is a PHP library that generates fake data for you.",