Update to Laravel 6

Stolz · Jan 3, 2020 · daa92b1 · daa92b1
2 parents c7c1722 + 25c36eb
commit daa92b1
Show file tree

Hide file tree

Showing 21 changed files with 1,039 additions and 805 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -11,5 +11,5 @@ trim_trailing_whitespace = true
 [*.md]
 trim_trailing_whitespace = false
 
-[*.yml]
+[*.{yml,yaml}]
 indent_size = 2
diff --git a/.env.example b/.env.example
@@ -48,11 +48,12 @@ MAIL_FROM_NAME="No reply"
 # choices: beanstalkd database null redis sqs sync
 QUEUE_CONNECTION=sync
 
-# choices: predis phpredis
+# choices: predis (package) phpredis (extension)
 REDIS_CLIENT=predis
 REDIS_HOST=localhost
 REDIS_PORT=6379
 REDIS_PASSWORD=null
 
 # choices: apc array cookie database file memcached redis
-SESSION_DRIVER=file
+SESSION_DRIVER=cookie
+SESSION_LIFETIME=120
diff --git a/readme.md → README.md b/readme.md → README.md
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -33,6 +33,8 @@ class Handler extends ExceptionHandler
      *
      * @param  \Exception  $exception
      * @return void
+     *
+     * @throws \Exception
      */
     public function report(Exception $exception)
     {
@@ -44,7 +46,9 @@ public function report(Exception $exception)
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @throws \Exception
      */
     public function render($request, Exception $exception)
     {

diff --git a/app/Http/Controllers/Auth/VerificationController.php b/app/Http/Controllers/Auth/VerificationController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\VerifiesEmails;
 
 class VerificationController extends Controller
@@ -25,7 +26,7 @@ class VerificationController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = "/home";
+    protected $redirectTo = RouteServiceProvider::HOME;
 
     /**
      * Create a new controller instance.

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -40,7 +40,7 @@ class Kernel extends HttpKernel
 
         'api' => [
             'throttle:60,1',
-            "bindings",
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];
 
@@ -60,6 +60,7 @@ class Kernel extends HttpKernel
         'can' => \App\Http\Middleware\Authorize::class,
         'env' => \App\Http\Middleware\Environment::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
@@ -76,6 +77,7 @@ class Kernel extends HttpKernel
         \Illuminate\Session\Middleware\StartSession::class,
         \Illuminate\View\Middleware\ShareErrorsFromSession::class,
         \App\Http\Middleware\Authenticate::class,
+        \Illuminate\Routing\Middleware\ThrottleRequests::class,
         \Illuminate\Session\Middleware\AuthenticateSession::class,
         \Illuminate\Routing\Middleware\SubstituteBindings::class,
         \Illuminate\Auth\Middleware\Authorize::class,

diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
@@ -10,7 +10,7 @@ class Authenticate extends Middleware
      * Get the path the user should be redirected to when they are not authenticated.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return string
+     * @return string|null
      */
     protected function redirectTo($request)
     {

diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
@@ -16,6 +16,13 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected $namespace = 'App\Http\Controllers';
 
+    /**
+     * The path to the "home" route for your application.
+     *
+     * @var string
+     */
+    public const HOME = '/';
+
     /**
      * Define your route model bindings, pattern filters, etc.
      *

diff --git a/composer.json b/composer.json
@@ -8,32 +8,33 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.1.3",
-        "beberlei/doctrineextensions": "^1.1",
-        "fideloper/proxy": "^4.0",
+        "php": "^7.2",
+        "beberlei/doctrineextensions": "^1.2",
+        "fideloper/proxy": "^4.2",
         "laravel-doctrine/extensions": "^1.0",
         "laravel-doctrine/fluent": "^1.1",
-        "laravel-doctrine/orm": "^1.4",
-        "laravel/framework": "5.8.*",
-        "laravel/tinker": "^1.0",
+        "laravel-doctrine/orm": "^1.5",
+        "laravel/framework": "^6.2",
+        "laravel/helpers": "^1.1",
+        "laravel/tinker": "^2.0",
         "phlak/colorizer": "^4.0",
         "tymon/jwt-auth": "^1.0"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.2",
         "beyondcode/laravel-dump-server": "^1.0",
-        "filp/whoops": "^2.2",
-        "friendsofphp/php-cs-fixer": "^2.13",
-        "fzaninotto/faker": "^1.8",
+        "filp/whoops": "^2.7",
+        "friendsofphp/php-cs-fixer": "^2.16",
+        "fzaninotto/faker": "^1.9",
         "laravel/dusk": "^5.0.0",
-        "mockery/mockery": "^1.1",
+        "mockery/mockery": "^1.3",
         "nunomaduro/collision": "^3.0",
-        "phpcompatibility/php-compatibility": "^9.0",
-        "phpmd/phpmd": "^2.6",
-        "phpstan/phpstan": "^0.11.2",
-        "phpunit/phpunit": "^7.5",
-        "slevomat/coding-standard": "^4.8",
-        "squizlabs/php_codesniffer": "^3.3"
+        "phpcompatibility/php-compatibility": "^9.3",
+        "phpmd/phpmd": "^2.8",
+        "phpstan/phpstan": "^0.11",
+        "phpunit/phpunit": "^8.2",
+        "slevomat/coding-standard": "^6.0",
+        "squizlabs/php_codesniffer": "^3.5"
     },
     "config": {
         "optimize-autoloader": true,