From 4b70f144054ae6849b5df18453e24ff6de033a40 Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Mon, 18 Jul 2022 09:03:31 +0800
Subject: [PATCH] Update PHPUnit config, tweaks to test config

---
 .github/workflows/tests.yml |  4 ++--
 .gitignore                  |  1 +
 phpunit.xml                 | 26 ++++++++++++++------------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 79dd9fd..a0501b0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -63,8 +63,8 @@ jobs:
       - name: Install Winter CMS
         run: |
           wget https://github.com/wintercms/winter/archive/${{ matrix.winterRelease }}.zip
-          unzip ${{ matrix.winterReleaseDir }}.zip
-          rm ${{ matrix.winterReleaseDir }}.zip
+          unzip ${{ matrix.winterRelease }}.zip
+          rm ${{ matrix.winterRelease }}.zip
           shopt -s dotglob
           mv winter-${{ matrix.winterReleaseDir }}/* ./
           rmdir winter-${{ matrix.winterReleaseDir }}
diff --git a/.gitignore b/.gitignore
index d1e0a89..011e918 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 composer.lock
 vendor
 .DS_Store
+.phpunit.result.cache
diff --git a/phpunit.xml b/phpunit.xml
index fbd1b9d..bfe81d8 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit 
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     backupGlobals="false"
     backupStaticAttributes="false"
     colors="true"
@@ -8,26 +9,27 @@
     convertWarningsToExceptions="true"
     processIsolation="false"
     stopOnFailure="false"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
 >
     <testsuites>
-        <testsuite name="winter.user">
+        <testsuite name="Winter.User">
             <directory>./tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <coverage processUncoveredFiles="true">
+        <include>
             <directory suffix=".php">./classes</directory>
             <directory suffix=".php">./components</directory>
             <directory suffix=".php">./controllers</directory>
             <directory suffix=".php">./facades</directory>
             <directory suffix=".php">./models</directory>
             <directory suffix=".php">./notifyrules</directory>
-            <exclude>
-                <file>./Plugin.php</file>
-                <directory>./tests</directory>
-                <directory>./updates</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+        </include>
+        <exclude>
+            <file>./Plugin.php</file>
+            <directory>./tests</directory>
+            <directory>./updates</directory>
+            <directory>./vendor</directory>
+        </exclude>
+    </coverage>
 </phpunit>