From f2d8a5091ded0b8d0f9f74abea0db35d78c7acc5 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Mon, 27 Mar 2017 19:10:51 +0100
Subject: [PATCH] Pull in latest laravel/laravel changes

---
 .env.example                           |  2 +-
 .gitattributes                         |  1 +
 app/Providers/EventServiceProvider.php |  2 +-
 composer.json                          |  3 ++-
 composer.lock                          | 14 +++++++-------
 config/database.php                    |  5 +++--
 config/view.php                        |  2 +-
 storage/framework/testing/.gitignore   |  2 ++
 8 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 storage/framework/testing/.gitignore

diff --git a/.env.example b/.env.example
index 15ee3f46..57ea1e36 100644
--- a/.env.example
+++ b/.env.example
@@ -22,7 +22,7 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_DRIVER=smtp
-MAIL_HOST=mailtrap.io
+MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
diff --git a/.gitattributes b/.gitattributes
index a8763f8e..2195b20d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
 * text=auto
 *.css linguist-vendored
 *.scss linguist-vendored
+*.js linguist-vendored
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index ed0e3e5b..9b28f3e3 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -13,7 +13,7 @@ class EventServiceProvider extends ServiceProvider
      * @var array
      */
     protected $listen = [
-        'App\Events\SomeEvent' => [
+        'App\Events\Event' => [
             'App\Listeners\EventListener',
         ],
     ];
diff --git a/composer.json b/composer.json
index be04049c..e742f29d 100644
--- a/composer.json
+++ b/composer.json
@@ -67,6 +67,7 @@
     },
     "config": {
         "preferred-install": "dist",
-        "sort-packages": true
+        "sort-packages": true,
+        "optimize-autoloader": true
     }
 }
diff --git a/composer.lock b/composer.lock
index 84679550..45e7bdf5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2658,16 +2658,16 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "3.6.0",
+            "version": "3.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "0b7bdfb180e72c8d76e75a649ced67e392201458"
+                "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/0b7bdfb180e72c8d76e75a649ced67e392201458",
-                "reference": "0b7bdfb180e72c8d76e75a649ced67e392201458",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/4ae32dd9ab8860a4bbd750ad269cba7f06f7934e",
+                "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e",
                 "shasum": ""
             },
             "require": {
@@ -2679,9 +2679,9 @@
             },
             "require-dev": {
                 "apigen/apigen": "^4.1",
-                "codeception/aspect-mock": "1.0.0",
+                "codeception/aspect-mock": "^1.0 | ^2.0",
                 "doctrine/annotations": "~1.2.0",
-                "goaop/framework": "1.0.0-alpha.2",
+                "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1",
                 "ircmaxell/random-lib": "^1.1",
                 "jakub-onderka/php-parallel-lint": "^0.9.0",
                 "mockery/mockery": "^0.9.4",
@@ -2736,7 +2736,7 @@
                 "identifier",
                 "uuid"
             ],
-            "time": "2017-03-18T15:38:09+00:00"
+            "time": "2017-03-26T20:37:53+00:00"
         },
         {
             "name": "sensiolabs/security-checker",
diff --git a/config/database.php b/config/database.php
index d32ac66a..cd74d4d7 100644
--- 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,
diff --git a/config/view.php b/config/view.php
index e193ab61..2acfd9cc 100644
--- a/config/view.php
+++ b/config/view.php
@@ -14,7 +14,7 @@ return [
     */
 
     'paths' => [
-        realpath(base_path('resources/views')),
+        resource_path('views'),
     ],
 
     /*
diff --git a/storage/framework/testing/.gitignore b/storage/framework/testing/.gitignore
new file mode 100644
index 00000000..d6b7ef32
--- /dev/null
+++ b/storage/framework/testing/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore