From e4f20eac3649d5bb21531bee98326b434b36e744 Mon Sep 17 00:00:00 2001
From: Dries Vints <dries.vints@gmail.com>
Date: Sat, 9 Feb 2019 12:21:57 +0100
Subject: [PATCH 1/4] Reverse minimum PHPUnit version

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index cac24560..a8b9aec8 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
         "fzaninotto/faker": "^1.4",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^2.0",
-        "phpunit/phpunit": "^8.0"
+        "phpunit/phpunit": "^7.0"
     },
     "config": {
         "optimize-autoloader": true,

From 75468420a4c6c28b980319240056e884b4647d63 Mon Sep 17 00:00:00 2001
From: Dries Vints <dries.vints@gmail.com>
Date: Sat, 9 Feb 2019 14:05:33 +0100
Subject: [PATCH 2/4] Use same version as framework

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a8b9aec8..bda43337 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
         "fzaninotto/faker": "^1.4",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^2.0",
-        "phpunit/phpunit": "^7.0"
+        "phpunit/phpunit": "^7.5"
     },
     "config": {
         "optimize-autoloader": true,

From fae44eeb26d549a695a1ea0267b117adf55f83e8 Mon Sep 17 00:00:00 2001
From: Dries Vints <dries.vints@gmail.com>
Date: Tue, 12 Feb 2019 16:53:32 +0100
Subject: [PATCH 3/4] Replace string helper

---
 database/factories/UserFactory.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index bd5bb9fb..2985ea24 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\User;
+use Illuminate\Support\Str;
 use Faker\Generator as Faker;
 
 /*
@@ -20,6 +21,6 @@
         'email' => $faker->unique()->safeEmail,
         'email_verified_at' => now(),
         'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
-        'remember_token' => str_random(10),
+        'remember_token' => Str::random(10),
     ];
 });

From 69bd1dceefb1434e57dbbda7625c571030dd5edb Mon Sep 17 00:00:00 2001
From: Mior Muhammad Zaki <crynobone@gmail.com>
Date: Wed, 13 Feb 2019 08:54:45 +0800
Subject: [PATCH 4/4] Use $_SERVER instead of $_ENV for phpunit.

Laravel 5.8 limits dotenv to only rely on $_SERVER and not $_ENV. See https://github.com/laravel/framework/pull/27462
---
 phpunit.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpunit.xml b/phpunit.xml
index 9566b67e..da4add30 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -23,11 +23,11 @@
         </whitelist>
     </filter>
     <php>
-        <env name="APP_ENV" value="testing"/>
-        <env name="BCRYPT_ROUNDS" value="4"/>
-        <env name="CACHE_DRIVER" value="array"/>
-        <env name="MAIL_DRIVER" value="array"/>
-        <env name="QUEUE_CONNECTION" value="sync"/>
-        <env name="SESSION_DRIVER" value="array"/>
+        <server name="APP_ENV" value="testing"/>
+        <server name="BCRYPT_ROUNDS" value="4"/>
+        <server name="CACHE_DRIVER" value="array"/>
+        <server name="MAIL_DRIVER" value="array"/>
+        <server name="QUEUE_CONNECTION" value="sync"/>
+        <server name="SESSION_DRIVER" value="array"/>
     </php>
 </phpunit>