lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2049 from CachetHQ/dep

Browse Source 
Updated deps
This commit is contained in:
Graham Campbell
2016-08-10 11:24:03 +01:00
committed by GitHub
parent a947cffcb8 e63a858721
commit f002575e54
2 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -21,7 +21,7 @@
"require": {
"php": ">=5.5.9",
"ext-xml": "*",
"laravel/framework": "5.2.39",
"laravel/framework": "5.2.42",
"alt-three/badger": "^3.1",
"alt-three/bus": "^1.1",
"alt-three/emoji": "^3.1",

54
composer.lock generated
View File

@@ -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": "620cb80f29b93d4e6cf74e34ad35e39c",
"content-hash": "1669c288238ee037a297e8ed1f2a536e",
"hash": "1dc978d52e4aa7b9bbcf2c969b249757",
"content-hash": "df467d32b00f3f52f78b2831b4d5dc15",
"packages": [
{
"name": "alt-three/badger",
@@ -325,16 +325,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.18.37",
"version": "3.18.38",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "0d4abd38caf09fbda9177e8c1fd2a9ec73d71d66"
"reference": "979470feb19af8b5cd2f7a455407618416cdfadc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0d4abd38caf09fbda9177e8c1fd2a9ec73d71d66",
"reference": "0d4abd38caf09fbda9177e8c1fd2a9ec73d71d66",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/979470feb19af8b5cd2f7a455407618416cdfadc",
"reference": "979470feb19af8b5cd2f7a455407618416cdfadc",
"shasum": ""
},
"require": {
@@ -401,7 +401,7 @@
"s3",
"sdk"
],
"time": "2016-08-04 21:27:47"
"time": "2016-08-09 18:09:34"
},
{
"name": "backup-manager/backup-manager",
@@ -2019,16 +2019,16 @@
},
{
"name": "laravel/framework",
"version": "v5.2.39",
"version": "v5.2.42",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "c2a77050269b4e03bd9a735a9f24e573a7598b8a"
"reference": "d1bf46f359d2ede2d4ef847fb79d3758d868f2b7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/c2a77050269b4e03bd9a735a9f24e573a7598b8a",
"reference": "c2a77050269b4e03bd9a735a9f24e573a7598b8a",
"url": "https://api.github.com/repos/laravel/framework/zipball/d1bf46f359d2ede2d4ef847fb79d3758d868f2b7",
"reference": "d1bf46f359d2ede2d4ef847fb79d3758d868f2b7",
"shasum": ""
},
"require": {
@@ -2085,7 +2085,8 @@
"illuminate/support": "self.version",
"illuminate/translation": "self.version",
"illuminate/validation": "self.version",
"illuminate/view": "self.version"
"illuminate/view": "self.version",
"tightenco/collect": "self.version"
},
"require-dev": {
"aws/aws-sdk-php": "~3.0",
@@ -2144,7 +2145,7 @@
"framework",
"laravel"
],
"time": "2016-06-17 19:25:12"
"time": "2016-08-08 13:39:44"
},
{
"name": "league/commonmark",
@@ -2217,16 +2218,16 @@
},
{
"name": "league/flysystem",
"version": "1.0.26",
"version": "1.0.27",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "fb3b30dca320b36931ea878fea17ebe136fba1b0"
"reference": "50e2045ed70a7e75a5e30bc3662904f3b67af8a9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/fb3b30dca320b36931ea878fea17ebe136fba1b0",
"reference": "fb3b30dca320b36931ea878fea17ebe136fba1b0",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/50e2045ed70a7e75a5e30bc3662904f3b67af8a9",
"reference": "50e2045ed70a7e75a5e30bc3662904f3b67af8a9",
"shasum": ""
},
"require": {
@@ -2296,7 +2297,7 @@
"sftp",
"storage"
],
"time": "2016-08-03 09:49:11"
"time": "2016-08-10 08:55:11"
},
{
"name": "mccool/laravel-auto-presenter",
@@ -5561,28 +5562,29 @@
},
{
"name": "webmozart/assert",
"version": "1.0.2",
"version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
"reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde"
"reference": "bb2d123231c095735130cc8f6d31385a44c7b308"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
"reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
"url": "https://api.github.com/repos/webmozart/assert/zipball/bb2d123231c095735130cc8f6d31385a44c7b308",
"reference": "bb2d123231c095735130cc8f6d31385a44c7b308",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": "^5.3.3|^7.0"
},
"require-dev": {
"phpunit/phpunit": "^4.6"
"phpunit/phpunit": "^4.6",
"sebastian/version": "^1.0.1"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "1.2-dev"
}
},
"autoload": {
@@ -5606,7 +5608,7 @@
"check",
"validate"
],
"time": "2015-08-24 13:29:44"
"time": "2016-08-09 15:02:57"
}
],
"aliases": [],