Update to Laravel 5.6

app/Http/Middleware/TrustProxies.php

@@ -15,15 +15,9 @@ class TrustProxies extends Middleware
     protected $proxies;
 
     /**
-     * The current proxy header mappings.
+     * The header that should be used to detect proxies.
      *
-     * @var array
+     * @var string
      */
-    protected $headers = [
+    protected $headers = Request::HEADER_X_FORWARDED_ALL;
-        Request::HEADER_FORWARDED => 'FORWARDED',
-        Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
-        Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
-        Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
-        Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
-    ];
 }

composer.json

@@ -8,7 +8,7 @@
         "php": ">=7.2.0",
         "cviebrock/eloquent-sluggable": "~4.3",
         "ezyang/htmlpurifier": "~4.6",
-        "fideloper/proxy": "~3.3",
+        "fideloper/proxy": "~4.0",
         "guzzlehttp/guzzle": "~6.0",
         "indieauth/client": "~0.1",
         "intervention/image": "^2.4",
@@ -16,16 +16,16 @@
         "jonnybarnes/emoji-a11y": "^0.3",
         "jonnybarnes/indieweb": "dev-master",
         "jonnybarnes/webmentions-parser": "0.4.*",
-        "laravel/framework": "5.5.*",
+        "laravel/framework": "5.6.*",
         "laravel/horizon": "^1.0",
-        "laravel/scout": "^3.0",
+        "laravel/scout": "^4.0",
         "laravel/tinker": "^1.0",
         "lcobucci/jwt": "^3.1",
         "league/commonmark": "^0.17.0",
         "league/flysystem-aws-s3-v3": "^1.0",
         "mf2/mf2": "~0.3",
         "phaza/laravel-postgis": "~3.1",
-        "pmatseykanets/laravel-scout-postgres": "~1.0",
+        "pmatseykanets/laravel-scout-postgres": "~2.0",
         "predis/predis": "~1.0",
         "ramsey/uuid": "^3.5",
         "sensiolabs/security-checker": "^4.0",
@@ -34,16 +34,15 @@
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "~3.0",
-        "bmitch/churn-php": "^0.4.0",
+        "codedungeon/phpunit-result-printer": "^0.6.0",
-        "codedungeon/phpunit-result-printer": "^0.5.0",
         "filp/whoops": "~2.0",
         "fzaninotto/faker": "~1.4",
         "jakub-onderka/php-parallel-lint": "^0.9.2",
-        "laravel/dusk": "^2.0",
+        "laravel/dusk": "^3.0",
-        "mockery/mockery": "0.9.*",
+        "mockery/mockery": "~1.0",
         "nunomaduro/collision": "^1.1",
-        "phpunit/phpunit": "~6.0",
+        "phpunit/phpunit": "~7.0",
-        "sebastian/phpcpd": "^3.0"
+        "symfony/thanks": "~1.0"
     },
     "autoload": {
         "classmap": [
@@ -84,5 +83,7 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "optimize-autoloader": true
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

config/app.php

@@ -141,23 +141,6 @@ return [
 
     'cipher' => 'AES-256-CBC',
 
-    /*
-    |--------------------------------------------------------------------------
-    | Logging Configuration
-    |--------------------------------------------------------------------------
-    |
-    | Here you may configure the log settings for your application. Out of
-    | the box, Laravel uses the Monolog PHP logging library. This gives
-    | you a variety of powerful log handlers / formatters to utilize.
-    |
-    | Available Settings: "single", "daily", "syslog", "errorlog"
-    |
-    */
-
-    'log' => env('APP_LOG', 'single'),
-
-    'log_level' => env('APP_LOG_LEVEL', 'debug'),
-
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers

config/hashing.php

@@ -0,0 +1,20 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Hash Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default hash driver that will be used to hash
+    | passwords for your application. By default, the bcrypt algorithm is
+    | used; however, you remain free to modify this option if you wish.
+    |
+    | Supported: "bcrypt", "argon"
+    |
+    */
+
+    'driver' => 'bcrypt',
+
+];

config/logging.php

@@ -0,0 +1,70 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Log Channel
+    |--------------------------------------------------------------------------
+    |
+    | This option defines the default log channel that gets used when writing
+    | messages to the logs. The name specified in this option should match
+    | one of the channels defined in the "channels" configuration array.
+    |
+    */
+
+    'default' => env('LOG_CHANNEL', 'stack'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Log Channels
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure the log channels for your application. Out of
+    | the box, Laravel uses the Monolog PHP logging library. This gives
+    | you a variety of powerful log handlers / formatters to utilize.
+    |
+    | Available Drivers: "single", "daily", "slack", "syslog",
+    |                    "errorlog", "custom", "stack"
+    |
+    */
+
+    'channels' => [
+        'stack' => [
+            'driver' => 'stack',
+            'channels' => ['daily'],
+        ],
+
+        'single' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/laravel.log'),
+            'level' => 'debug',
+        ],
+
+        'daily' => [
+            'driver' => 'daily',
+            'path' => storage_path('logs/laravel.log'),
+            'level' => 'debug',
+            'days' => 7,
+        ],
+
+        'slack' => [
+            'driver' => 'slack',
+            'url' => env('LOG_SLACK_WEBHOOK_URL'),
+            'username' => 'Laravel Log',
+            'emoji' => ':boom:',
+            'level' => 'critical',
+        ],
+
+        'syslog' => [
+            'driver' => 'syslog',
+            'level' => 'debug',
+        ],
+
+        'errorlog' => [
+            'driver' => 'errorlog',
+            'level' => 'debug',
+        ],
+    ],
+
+];