Squashed commit of the following:

commit 7058c85d4204a9bc4f9cb5e7d8db906062766ba7
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Fri Oct 5 20:29:46 2018 +0100

    Update laravel and other dependencies
This commit is contained in:
Jonny Barnes 2018-10-05 20:37:08 +01:00
parent 4abff97b63
commit b2c05d1068
2 changed files with 499 additions and 377 deletions

View file

@ -12,33 +12,33 @@
"guzzlehttp/guzzle": "~6.0",
"indieauth/client": "~0.1",
"intervention/image": "^2.4",
"jonnybarnes/commonmark-linkify": "^0.4",
"jonnybarnes/commonmark-linkify": "^0.5",
"jonnybarnes/emoji-a11y": "^0.3",
"jonnybarnes/indieweb": "dev-master",
"jonnybarnes/webmentions-parser": "0.4.*",
"laravel/framework": "5.6.*",
"laravel/framework": "5.7.*",
"laravel/horizon": "^1.0",
"laravel/scout": "^4.0",
"laravel/scout": "^5.0",
"laravel/tinker": "^1.0",
"lcobucci/jwt": "^3.1",
"league/commonmark": "^0.17.0",
"league/commonmark": "^0.18.0",
"league/flysystem-aws-s3-v3": "^1.0",
"mf2/mf2": "~0.3",
"phaza/laravel-postgis": "~3.1",
"pmatseykanets/laravel-scout-postgres": "~2.0",
"pmatseykanets/laravel-scout-postgres": "~3.0",
"predis/predis": "~1.0",
"ramsey/uuid": "^3.5",
"sensiolabs/security-checker": "^4.0",
"sensiolabs/security-checker": "^5.0",
"spatie/browsershot": "~3.0",
"thujohn/twitter": "~2.0"
},
"require-dev": {
"barryvdh/laravel-debugbar": "~3.0",
"codedungeon/phpunit-result-printer": "^0.19.0",
"codedungeon/phpunit-result-printer": "^0.22.0",
"filp/whoops": "~2.0",
"fzaninotto/faker": "~1.4",
"jakub-onderka/php-parallel-lint": "^1.0.0",
"laravel/dusk": "^3.0",
"laravel/dusk": "^4.0",
"mockery/mockery": "~1.0",
"nunomaduro/collision": "^2.0",
"phpunit/phpunit": "~7.0",

860
composer.lock generated

File diff suppressed because it is too large Load diff