Squashed commit of the following:

commit 70d23bbd8fbdbeb3b6554e42ac4283396372f39d
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Fri Feb 3 21:40:55 2017 +0000

    Updade to Laravel 5.4
This commit is contained in:
Jonny Barnes 2017-02-03 21:49:49 +00:00
parent 9ee898ba7c
commit 0a07811311
33 changed files with 581 additions and 606 deletions

View file

@ -1,13 +1,13 @@
{
"name": "jonnybarnes/jonnybarnes.uk",
"description": "The code for jonnybanres.uk, based on Laravel 5.3",
"description": "The code for jonnybanres.uk, based on Laravel 5.4",
"keywords": ["framework", "laravel", "indieweb"],
"license": "CC0-1.0",
"type": "project",
"require": {
"ext-intl": "*",
"php": ">=7.0.0",
"laravel/framework": "5.3.*",
"laravel/framework": "5.4.*",
"jonnybarnes/indieweb": "dev-master",
"jonnybarnes/webmentions-parser": "0.4.*",
"guzzlehttp/guzzle": "~6.0",
@ -23,14 +23,16 @@
"phaza/laravel-postgis": "~3.1",
"lcobucci/jwt": "^3.1",
"sensiolabs/security-checker": "^4.0",
"laravel/scout": "^1.1",
"pmatseykanets/laravel-scout-postgres": "^0.2.0",
"jonnybarnes/emoji-a11y": "^0.1.1"
"laravel/scout": "^3.0",
"pmatseykanets/laravel-scout-postgres": "^0.5.0",
"jonnybarnes/emoji-a11y": "^0.1.1",
"laravel/tinker": "^1.0",
"laravel/browser-kit-testing": "^1.0"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "~5.0",
"phpunit/phpunit": "~5.7",
"symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.1.*",
"barryvdh/laravel-debugbar": "~2.0",
@ -46,12 +48,13 @@
},
"autoload-dev": {
"classmap": [
"tests/TestCase.php"
"tests/TestCase.php",
"tests/BrowserKitTest.php"
]
},
"scripts": {
"post-root-package-install": [
"php -r \"copy('.env.example', '.env');\""
"php -r \"file_exists('.env') || copy('.env.example', '.env');\""
],
"post-create-project-cmd": [
"php artisan key:generate"
@ -66,6 +69,7 @@
]
},
"config": {
"preferred-install": "dist"
"preferred-install": "dist",
"sort-packages": true
}
}