From 2dd6aee8413b95691a22aaa391da2a8c8586c349 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Mon, 13 Jun 2016 10:32:24 +0100 Subject: [PATCH] Update dependencies --- composer.lock | 67 +++++++++++++++++++++++++++------------------------ package.json | 6 +++-- 2 files changed, 39 insertions(+), 34 deletions(-) diff --git a/composer.lock b/composer.lock index dfe7330f..a128e002 100644 --- a/composer.lock +++ b/composer.lock @@ -59,16 +59,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.18.16", + "version": "3.18.17", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "5b959dda467752d4db8fa41fe9bbce85cabbe81e" + "reference": "6c7849556f556da8615d22e675710c7a086ed5d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5b959dda467752d4db8fa41fe9bbce85cabbe81e", - "reference": "5b959dda467752d4db8fa41fe9bbce85cabbe81e", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6c7849556f556da8615d22e675710c7a086ed5d0", + "reference": "6c7849556f556da8615d22e675710c7a086ed5d0", "shasum": "" }, "require": { @@ -135,7 +135,7 @@ "s3", "sdk" ], - "time": "2016-06-07 21:16:15" + "time": "2016-06-09 23:39:33" }, { "name": "barnabywalters/mf-cleaner", @@ -1131,16 +1131,16 @@ }, { "name": "laravel/framework", - "version": "v5.2.36", + "version": "v5.2.37", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "236d7c0c5b67a2348ac7831391031d93000de3ab" + "reference": "bf199036b0e222a27e2133d841aee0d4238f804d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/236d7c0c5b67a2348ac7831391031d93000de3ab", - "reference": "236d7c0c5b67a2348ac7831391031d93000de3ab", + "url": "https://api.github.com/repos/laravel/framework/zipball/bf199036b0e222a27e2133d841aee0d4238f804d", + "reference": "bf199036b0e222a27e2133d841aee0d4238f804d", "shasum": "" }, "require": { @@ -1256,7 +1256,7 @@ "framework", "laravel" ], - "time": "2016-06-06 15:18:48" + "time": "2016-06-10 22:38:47" }, { "name": "lcobucci/jwt", @@ -4054,22 +4054,22 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.0.2", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "45ada3e3fd09789fbfbd6d65b3f0901f0030dc61" + "reference": "9270140b940ff02e58ec577c237274e92cd40cdd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/45ada3e3fd09789fbfbd6d65b3f0901f0030dc61", - "reference": "45ada3e3fd09789fbfbd6d65b3f0901f0030dc61", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd", + "reference": "9270140b940ff02e58ec577c237274e92cd40cdd", "shasum": "" }, "require": { "php": ">=5.5", "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.1.5", + "phpdocumentor/type-resolver": "^0.2.0", "webmozart/assert": "^1.0" }, "require-dev": { @@ -4095,20 +4095,20 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-06-06 06:44:13" + "time": "2016-06-10 09:48:41" }, { "name": "phpdocumentor/type-resolver", - "version": "0.1.8", + "version": "0.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "9891754231e55d42f0d16988ffb799af39f31a12" + "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9891754231e55d42f0d16988ffb799af39f31a12", - "reference": "9891754231e55d42f0d16988ffb799af39f31a12", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443", + "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443", "shasum": "" }, "require": { @@ -4117,7 +4117,7 @@ }, "require-dev": { "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^5.2" + "phpunit/phpunit": "^5.2||^4.8.24" }, "type": "library", "extra": { @@ -4142,7 +4142,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-03-28 10:02:29" + "time": "2016-06-10 07:14:17" }, { "name": "phpspec/prophecy", @@ -4452,16 +4452,16 @@ }, { "name": "phpunit/phpunit", - "version": "5.4.2", + "version": "5.4.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "f5726a0262e5f74f8e9cf03128798b64160c441d" + "reference": "02d5b64aa0837a038a5a4faeeefa5ef44bdcb928" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f5726a0262e5f74f8e9cf03128798b64160c441d", - "reference": "f5726a0262e5f74f8e9cf03128798b64160c441d", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/02d5b64aa0837a038a5a4faeeefa5ef44bdcb928", + "reference": "02d5b64aa0837a038a5a4faeeefa5ef44bdcb928", "shasum": "" }, "require": { @@ -4488,6 +4488,9 @@ "sebastian/version": "~1.0|~2.0", "symfony/yaml": "~2.1|~3.0" }, + "conflict": { + "phpdocumentor/reflection-docblock": "3.0.2" + }, "suggest": { "phpunit/php-invoker": "~1.1" }, @@ -4523,20 +4526,20 @@ "testing", "xunit" ], - "time": "2016-06-03 09:59:50" + "time": "2016-06-09 09:09:27" }, { "name": "phpunit/phpunit-mock-objects", - "version": "3.2.1", + "version": "3.2.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "0dc8fd8e87e0366c22b6c25d1f43c4e2e66847b3" + "reference": "b13d0d9426ced06958bd32104653526a6c998a52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/0dc8fd8e87e0366c22b6c25d1f43c4e2e66847b3", - "reference": "0dc8fd8e87e0366c22b6c25d1f43c4e2e66847b3", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/b13d0d9426ced06958bd32104653526a6c998a52", + "reference": "b13d0d9426ced06958bd32104653526a6c998a52", "shasum": "" }, "require": { @@ -4582,7 +4585,7 @@ "mock", "xunit" ], - "time": "2016-06-04 05:52:19" + "time": "2016-06-12 07:37:26" }, { "name": "sebastian/code-unit-reverse-lookup", diff --git a/package.json b/package.json index d8015224..a4c57cca 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,15 @@ { "name": "jbuk-frontend", "version": "0.0.1", - "repository": "https://github.com/jonnybarnes/jbl5", + "repository": "https://github.com/jonnybarnes/jonnybarnes.uk", "license": "CC0-1.0", "devDependencies": { "gulp": "~3.9", "gulp-brotli": "^1.0.1", "gulp-zopfli": "^1.0.0", - "laravel-elixir": "^5.0.0" + "laravel-elixir": "^5.0.0", + "lint-staged": "^1.0.1", + "pre-commit": "^1.1.3" }, "private": true, "scripts": {