Pull in latest laravel/laravel changes

2017-03-27 19:10:51 +01:00 · 2017-03-27 19:10:51 +01:00 · f2d8a5091d
commit f2d8a5091d
parent 997ade3c34
8 changed files with 18 additions and 13 deletions
--- a/config/database.php
+++ b/config/database.php
@ -46,8 +46,9 @@ return [
            'database' => env('DB_DATABASE', 'forge'),
            'username' => env('DB_USERNAME', 'forge'),
            'password' => env('DB_PASSWORD', ''),
-            'charset' => 'utf8',
-            'collation' => 'utf8_unicode_ci',
+            'unix_socket' => env('DB_SOCKET', ''),
+            'charset' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
            'prefix' => '',
            'strict' => true,
            'engine' => null,