From 2c446984a12f01952e9df8df1b91687e78dfe200 Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Tue, 5 Apr 2016 11:22:18 +0100
Subject: [PATCH 1/4] Backport some env tweaks

---
 .env.example | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.env.example b/.env.example
index 031862bef64..cebc8926a2d 100644
--- a/.env.example
+++ b/.env.example
@@ -2,7 +2,8 @@ APP_ENV=local
 APP_DEBUG=true
 APP_KEY=SomeRandomString
 
-DB_HOST=localhost
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
 DB_DATABASE=homestead
 DB_USERNAME=homestead
 DB_PASSWORD=secret
@@ -11,7 +12,7 @@ CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync
 
-REDIS_HOST=localhost
+REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 

From 3a2cfbc2f4f59e4c602781a8a49931c487d65f55 Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Tue, 5 Apr 2016 11:22:29 +0100
Subject: [PATCH 2/4] Backport the better faker default

---
 database/factories/ModelFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index 0876c70c74f..f596d0b59b5 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -14,7 +14,7 @@
 $factory->define(App\User::class, function (Faker\Generator $faker) {
     return [
         'name' => $faker->name,
-        'email' => $faker->email,
+        'email' => $faker->safeEmail,
         'password' => bcrypt(str_random(10)),
         'remember_token' => str_random(10),
     ];

From 2dd40dfb40a005094ac50ccf6d1d96a4041807f9 Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Tue, 5 Apr 2016 11:22:53 +0100
Subject: [PATCH 3/4] Backport the phpunit fixes

---
 phpunit.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/phpunit.xml b/phpunit.xml
index cc0841c1d3c..3e884d179cc 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -10,12 +10,15 @@
          stopOnFailure="false">
     <testsuites>
         <testsuite name="Application Test Suite">
-            <directory>./tests/</directory>
+            <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
     <filter>
-        <whitelist>
-            <directory suffix=".php">app/</directory>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./app</directory>
+            <exclude>
+                <file>./app/Http/routes.php</file>
+            </exclude>
         </whitelist>
     </filter>
     <php>

From a6e0a2d190e1f219069f80434248658a5a0f79fa Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Tue, 5 Apr 2016 11:23:29 +0100
Subject: [PATCH 4/4] Backport the composer script fixes

---
 composer.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 0bd256f1e61..2b8950d8f07 100644
--- a/composer.json
+++ b/composer.json
@@ -28,19 +28,19 @@
         ]
     },
     "scripts": {
-        "post-install-cmd": [
-            "php artisan clear-compiled",
-            "php artisan optimize"
-        ],
-        "post-update-cmd": [
-            "php artisan clear-compiled",
-            "php artisan optimize"
-        ],
         "post-root-package-install": [
             "php -r \"copy('.env.example', '.env');\""
         ],
         "post-create-project-cmd": [
             "php artisan key:generate"
+        ],
+        "post-install-cmd": [
+            "Illuminate\\Foundation\\ComposerScripts::postInstall",
+            "php artisan optimize"
+        ],
+        "post-update-cmd": [
+            "Illuminate\\Foundation\\ComposerScripts::postUpdate",
+            "php artisan optimize"
         ]
     },
     "config": {