Commit cbf9d70
committed
Updated to laravel 6
1 parent 140298b commit cbf9d70
17 files changed
Lines changed: 569 additions & 324 deletions
File tree
- app
- Config
- Http
- database/factories
- resources/views
- auth
- partials
- tests
- Auth
- Entity
- Unit
- Uploads
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,8 +1,8 @@ | |||
| 1 | 1 | dist: bionic | |
| 2 | 2 | language: php | |
| 3 | 3 | php: | |
| 4 | - - '7.1.3' | ||
| 5 | 4 | - '7.2' | |
| 5 | + - '7.3' | ||
| 6 | 6 | ||
| 7 | 7 | services: | |
| 8 | 8 | - mysql | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,6 @@ | |||
| 1 | 1 | <?php | |
| 2 | 2 | ||
| 3 | + use Monolog\Handler\NullHandler; | ||
| 3 | 4 | use Monolog\Handler\StreamHandler; | |
| 4 | 5 | ||
| 5 | 6 | /** | |
@@ -71,6 +72,11 @@ | |||
| 71 | 72 | 'driver' => 'errorlog', | |
| 72 | 73 | 'level' => 'debug', | |
| 73 | 74 | ], | |
| 75 | + | ||
| 76 | + 'null' => [ | ||
| 77 | + 'driver' => 'monolog', | ||
| 78 | + 'handler' => NullHandler::class, | ||
| 79 | + ], | ||
| 74 | 80 | ], | |
| 75 | 81 | ||
| 76 | 82 | ]; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -29,6 +29,7 @@ class Kernel extends HttpKernel | |||
| 29 | 29 | \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, | |
| 30 | 30 | \Illuminate\Session\Middleware\StartSession::class, | |
| 31 | 31 | \Illuminate\View\Middleware\ShareErrorsFromSession::class, | |
| 32 | + \Illuminate\Routing\Middleware\ThrottleRequests::class, | ||
| 32 | 33 | \BookStack\Http\Middleware\VerifyCsrfToken::class, | |
| 33 | 34 | \Illuminate\Routing\Middleware\SubstituteBindings::class, | |
| 34 | 35 | \BookStack\Http\Middleware\Localization::class | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,39 +5,38 @@ | |||
| 5 | 5 | "license": "MIT", | |
| 6 | 6 | "type": "project", | |
| 7 | 7 | "require": { | |
| 8 | - "php": "^7.1.3", | ||
| 8 | + "php": "^7.2", | ||
| 9 | + "ext-curl": "*", | ||
| 10 | + "ext-dom": "*", | ||
| 11 | + "ext-gd": "*", | ||
| 9 | 12 | "ext-json": "*", | |
| 13 | + "ext-mbstring": "*", | ||
| 10 | 14 | "ext-tidy": "*", | |
| 11 | - "ext-dom": "*", | ||
| 12 | 15 | "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", | ||
| 17 | 19 | "fideloper/proxy": "^4.0", | |
| 20 | + "gathercontent/htmldiff": "^0.2.1", | ||
| 18 | 21 | "intervention/image": "^2.5", | |
| 22 | + "laravel/framework": "^6.0", | ||
| 19 | 23 | "laravel/socialite": "^4.2", | |
| 20 | 24 | "league/flysystem-aws-s3-v3": "^1.0", | |
| 21 | - "barryvdh/laravel-dompdf": "^0.8.5", | ||
| 22 | - "barryvdh/laravel-snappy": "^0.4.5", | ||
| 23 | 25 | "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", | ||
| 26 | 28 | "socialiteproviders/microsoft-azure": "^3.0", | |
| 27 | 29 | "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" | ||
| 32 | 32 | }, | |
| 33 | 33 | "require-dev": { | |
| 34 | - "beyondcode/laravel-dump-server": "^1.0", | ||
| 35 | - "filp/whoops": "^2.0", | ||
| 34 | + "facade/ignition": "^1.4", | ||
| 36 | 35 | "fzaninotto/faker": "^1.4", | |
| 37 | 36 | "mockery/mockery": "^1.0", | |
| 38 | - "phpunit/phpunit": "^7.5", | ||
| 37 | + "phpunit/phpunit": "^8.0", | ||
| 39 | 38 | "nunomaduro/collision": "^3.0", | |
| 40 | - "laravel/browser-kit-testing": "^4.2.1", | ||
| 39 | + "laravel/browser-kit-testing": "^5.1", | ||
| 41 | 40 | "barryvdh/laravel-ide-helper": "^2.6.4", | |
| 42 | 41 | "barryvdh/laravel-debugbar": "^3.2.8", | |
| 43 | 42 | "squizlabs/php_codesniffer": "^3.4" | |
@@ -89,7 +88,7 @@ | |||
| 89 | 88 | "preferred-install": "dist", | |
| 90 | 89 | "sort-packages": true, | |
| 91 | 90 | "platform": { | |
| 92 | - "php": "7.1.3" | ||
| 91 | + "php": "7.2.0" | ||
| 93 | 92 | } | |
| 94 | 93 | }, | |
| 95 | 94 | "extra": { | |
0 commit comments