From de347ed88286e4dd6812baf2350ed2b71d0975c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20Lo=CC=88sken?= <hl@inquence.com>
Date: Thu, 25 Mar 2021 11:29:38 +0100
Subject: [PATCH 1/3] Update tests, statamic and php version

- Update newer phpunit config
- PHP 8 only
- Statamic 3.1

See #64
---
 composer.json    |  4 ++--
 phpunit.xml.dist | 47 +++++++++++++++++++++++++----------------------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/composer.json b/composer.json
index 337910d..310d84a 100644
--- a/composer.json
+++ b/composer.json
@@ -20,9 +20,9 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "ext-json": "*",
-        "statamic/cms": "^3.0.48"
+        "statamic/cms": "^3.1"
     },
     "require-dev": {
         "orchestra/testbench": "^6.15.0",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 2cf64fb..5ff395e 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
          backupGlobals="false"
          backupStaticAttributes="false"
          cacheResult="false"
          colors="true"
          verbose="true"
-         convertErrorsToExceptions="true"
+         convertErrorsToExceptions="false"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="true"
-         stopOnFailure="true">
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <env name="APP_ENV" value="testing"/>
-        <env name="APP_DEBUG" value="true"/>
-        <env name="APP_KEY" value="base64:mIRM5Fpb6DtuRIejBwkqpt3c/ovlFZsSpo66efwo3g0="/>
-        <env name="CACHE_DRIVER" value="array"/>
-        <env name="SESSION_DRIVER" value="array"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
-        <env name="MAIL_DRIVER" value="array"/>
-    </php>
+         stopOnFailure="true"
+>
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="APP_ENV" value="testing"/>
+    <env name="APP_DEBUG" value="true"/>
+    <env name="APP_KEY" value="base64:mIRM5Fpb6DtuRIejBwkqpt3c/ovlFZsSpo66efwo3g0="/>
+    <env name="CACHE_DRIVER" value="array"/>
+    <env name="SESSION_DRIVER" value="array"/>
+    <env name="QUEUE_DRIVER" value="sync"/>
+    <env name="MAIL_DRIVER" value="array"/>
+  </php>
 </phpunit>

From 138d558cf1da16590d125affc8bf3a9534d0a46a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20Lo=CC=88sken?= <hl@inquence.com>
Date: Thu, 25 Mar 2021 11:30:38 +0100
Subject: [PATCH 2/3] Fix gh actions

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b428c78..7706cdd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['7.4', '8.0']
+                php: ['8.0']
                 laravel: [7.*, 8.*]
                 dependency-version: [prefer-stable]
                 include:

From 4326422993ba76bd9644eaf34c90c2c1a90d880f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20Lo=CC=88sken?= <hl@inquence.com>
Date: Fri, 26 Mar 2021 10:23:01 +0100
Subject: [PATCH 3/3] Add missing pre update script

---
 composer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composer.json b/composer.json
index 310d84a..71834dd 100644
--- a/composer.json
+++ b/composer.json
@@ -54,6 +54,9 @@
         }
     },
     "scripts": {
+        "pre-update-cmd": [
+            "Statamic\\Console\\Composer\\Scripts::preUpdateCmd"
+        ],
         "test": "./vendor/bin/phpunit --debug --testdox",
         "test-clover-coverage": "./vendor/bin/phpunit --coverage-clover clover.xml",
         "test-coverage": "./vendor/bin/phpunit --coverage-html coverage"