Skip to content

Commit cbf9d70

Browse files
committed
Updated to laravel 6
1 parent 140298b commit cbf9d70

File tree

17 files changed

+569
-324
lines changed

17 files changed

+569
-324
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
dist: bionic
22
language: php
33
php:
4-
- '7.1.3'
54
- '7.2'
5+
- '7.3'
66

77
services:
88
- mysql

app/Config/logging.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php
22

3+
use Monolog\Handler\NullHandler;
34
use Monolog\Handler\StreamHandler;
45

56
/**
@@ -71,6 +72,11 @@
7172
'driver' => 'errorlog',
7273
'level' => 'debug',
7374
],
75+
76+
'null' => [
77+
'driver' => 'monolog',
78+
'handler' => NullHandler::class,
79+
],
7480
],
7581

7682
];

app/Http/Kernel.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class Kernel extends HttpKernel
2929
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
3030
\Illuminate\Session\Middleware\StartSession::class,
3131
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
32+
\Illuminate\Routing\Middleware\ThrottleRequests::class,
3233
\BookStack\Http\Middleware\VerifyCsrfToken::class,
3334
\Illuminate\Routing\Middleware\SubstituteBindings::class,
3435
\BookStack\Http\Middleware\Localization::class

composer.json

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,38 @@
55
"license": "MIT",
66
"type": "project",
77
"require": {
8-
"php": "^7.1.3",
8+
"php": "^7.2",
9+
"ext-curl": "*",
10+
"ext-dom": "*",
11+
"ext-gd": "*",
912
"ext-json": "*",
13+
"ext-mbstring": "*",
1014
"ext-tidy": "*",
11-
"ext-dom": "*",
1215
"ext-xml": "*",
13-
"ext-mbstring": "*",
14-
"ext-gd": "*",
15-
"ext-curl": "*",
16-
"laravel/framework": "5.8.*",
16+
"barryvdh/laravel-dompdf": "^0.8.5",
17+
"barryvdh/laravel-snappy": "^0.4.5",
18+
"doctrine/dbal": "^2.9",
1719
"fideloper/proxy": "^4.0",
20+
"gathercontent/htmldiff": "^0.2.1",
1821
"intervention/image": "^2.5",
22+
"laravel/framework": "^6.0",
1923
"laravel/socialite": "^4.2",
2024
"league/flysystem-aws-s3-v3": "^1.0",
21-
"barryvdh/laravel-dompdf": "^0.8.5",
22-
"barryvdh/laravel-snappy": "^0.4.5",
2325
"predis/predis": "^1.1",
24-
"gathercontent/htmldiff": "^0.2.1",
25-
"socialiteproviders/slack": "^3.0",
26+
"socialiteproviders/discord": "^2.0",
27+
"socialiteproviders/gitlab": "^3.0",
2628
"socialiteproviders/microsoft-azure": "^3.0",
2729
"socialiteproviders/okta": "^1.0",
28-
"socialiteproviders/gitlab": "^3.0",
29-
"socialiteproviders/twitch": "^3.0",
30-
"socialiteproviders/discord": "^2.0",
31-
"doctrine/dbal": "^2.9"
30+
"socialiteproviders/slack": "^3.0",
31+
"socialiteproviders/twitch": "^3.0"
3232
},
3333
"require-dev": {
34-
"beyondcode/laravel-dump-server": "^1.0",
35-
"filp/whoops": "^2.0",
34+
"facade/ignition": "^1.4",
3635
"fzaninotto/faker": "^1.4",
3736
"mockery/mockery": "^1.0",
38-
"phpunit/phpunit": "^7.5",
37+
"phpunit/phpunit": "^8.0",
3938
"nunomaduro/collision": "^3.0",
40-
"laravel/browser-kit-testing": "^4.2.1",
39+
"laravel/browser-kit-testing": "^5.1",
4140
"barryvdh/laravel-ide-helper": "^2.6.4",
4241
"barryvdh/laravel-debugbar": "^3.2.8",
4342
"squizlabs/php_codesniffer": "^3.4"
@@ -89,7 +88,7 @@
8988
"preferred-install": "dist",
9089
"sort-packages": true,
9190
"platform": {
92-
"php": "7.1.3"
91+
"php": "7.2.0"
9392
}
9493
},
9594
"extra": {

0 commit comments

Comments
 (0)