From 8b55910690dfeeef7a6013321e22e68181ba8306 Mon Sep 17 00:00:00 2001
From: Harish Toshniwal <haristoshniwal@gmail.com>
Date: Fri, 11 Sep 2020 00:08:51 +0530
Subject: [PATCH] v7

---
 .gitignore             |  1 +
 CHANGELOG.md           |  4 ++++
 composer.json          | 11 ++++++-----
 phpunit.xml.dist       | 30 ++++++++++++------------------
 tests/BaseTestCase.php |  5 +----
 5 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/.gitignore b/.gitignore
index 19adabd..8105bc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ composer.lock
 .DS_Store
 Thumbs.db
 phpunit.xml
+.phpunit.result.cache
 /.idea
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dc927a..c62a570 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 All notable changes to the Laravel Mail Viewer be documented in this file
 
+## v7.0.0 (10-09-2020)
+- Added Laravel v8.x support.
+- Dropped Laravel v6 & PHPUnit v8 support.
+
 ## v6.0.0 (03-03-2020)
 - Added Laravel v7.x support.
 - Dropped PHP v7.2 support, now PHP v7.3 is the minimum requirement.
diff --git a/composer.json b/composer.json
index d0e4a68..1845220 100644
--- a/composer.json
+++ b/composer.json
@@ -20,14 +20,15 @@
     },
     "require": {
         "php": "^7.3",
-        "illuminate/routing": "6.*|7.*",
-        "illuminate/support": "6.*|7.*",
-        "illuminate/database": "6.*|7.*"
+        "illuminate/routing": "7.*|8.*",
+        "illuminate/support": "7.*|8.*",
+        "illuminate/database": "7.*|8.*"
     },
     "require-dev": {
+        "laravel/legacy-factories": "^1.0.4",
         "mockery/mockery": "^1.1",
-        "orchestra/testbench": "4.*|5.*",
-        "phpunit/phpunit": "^8.0"
+        "orchestra/testbench": "5.*|6.*",
+        "phpunit/phpunit": "^9.0"
     },
     "extra": {
         "laravel": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 15526df..9e3f16a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Package Tests">
-            <directory suffix="Test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
\ No newline at end of file
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Package Tests">
+      <directory suffix="Test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>
diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php
index ad5c3a6..47f5247 100644
--- a/tests/BaseTestCase.php
+++ b/tests/BaseTestCase.php
@@ -20,10 +20,7 @@ public function setUp(): void
 
         $this->withFactories(__DIR__ . '/Database/Factories');
 
-        $this->loadMigrationsFrom([
-            '--database' => 'testing',
-            '--path' => __DIR__ . '/Database/Migrations'
-        ]);
+        $this->loadMigrationsFrom(__DIR__ . '/Database/Migrations');
 
         $this->artisan('migrate', ['--database' => 'testing']);
     }