Skip to content
This repository has been archived by the owner on Dec 11, 2020. It is now read-only.

Commit

Permalink
Merge pull request #16 from lucid-architecture/6.0
Browse files Browse the repository at this point in the history
Upgrade Laravel to v6
  • Loading branch information
harris21 authored Sep 13, 2020
2 parents 8f2a5aa + b76d962 commit feb1e93
Show file tree
Hide file tree
Showing 15 changed files with 2,507 additions and 1,139 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ root = true
[*.md]
trim_trailing_whitespace = false

[*.yml]
[*.yml,yaml]
indent_size = 2
1 change: 1 addition & 0 deletions app/Http/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ class Kernel extends HttpKernel
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\Framework\Http\Middleware\Authenticate::class,
\Illuminate\Routing\Middleware\ThrottleRequests::class,
\Illuminate\Session\Middleware\AuthenticateSession::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\Illuminate\Auth\Middleware\Authorize::class,
Expand Down
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@
"license": "MIT",
"type": "project",
"require": {
"php": ">=7.1.3",
"laravel/framework": "5.8.*",
"lucid-arch/laravel-foundation": "5.8.*",
"laravel/tinker": "^1.0",
"php": "^7.2",
"laravel/framework": "^6.18.35",
"lucid-arch/laravel-foundation": "^6.0",
"laravel/helpers": "^1.1",
"laravel/tinker": "^2.0",
"fideloper/proxy": "~4.0"
},
"require-dev": {
"fzaninotto/faker": "^1.4",
"fzaninotto/faker": "^1.9.1",
"mockery/mockery": "^1.0",
"facade/ignition": "^1.4",
"nunomaduro/collision": "^3.0",
"phpunit/phpunit": "^7.5",
"phpunit/phpunit": "^8.0",
"symfony/css-selector": "~4.0",
"symfony/dom-crawler": "~4.0",
"lucid-arch/laravel-console": "5.8.*",
"beyondcode/laravel-dump-server": "^1.0",
"filp/whoops": "^2.0"
"lucid-arch/laravel-console": "^6.0"
},
"autoload": {
"classmap": [
Expand Down
Loading

0 comments on commit feb1e93

Please sign in to comment.