From 5da9c2e525cd9f84a5bb9895c6cb821dce0415fc Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Fri, 28 Apr 2023 17:37:41 +0100
Subject: [PATCH] ci: consistent workflow for all tests (#351)

closes #350
---
 .github/workflows/ci.yml |  2 --
 composer.json            |  2 +-
 composer.lock            | 32 +++++++++++++++++---------------
 phpunit.xml              | 28 ++++++++++++++++++++++++++++
 test/phpunit/phpunit.xml | 18 ------------------
 5 files changed, 46 insertions(+), 36 deletions(-)
 create mode 100644 phpunit.xml
 delete mode 100644 test/phpunit/phpunit.xml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cbe6308..fa84933 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -58,8 +58,6 @@ jobs:
         with:
           php_version: ${{ matrix.php }}
           php_extensions: xdebug
-          configuration: test/phpunit/phpunit.xml
-          bootstrap: vendor/autoload.php
           coverage_text: _coverage/coverage.txt
           coverage_clover: _coverage/clover.xml
 
diff --git a/composer.json b/composer.json
index 1951475..56367ad 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
 	"require-dev": {
 		"ext-sqlite3": "*",
 		"phpstan/phpstan": "^v1.10",
-		"phpunit/phpunit": "^10.0",
+		"phpunit/phpunit": "^10.1",
 		"phpmd/phpmd": "^2.13",
 		"squizlabs/php_codesniffer": "^3.7"
 	},
diff --git a/composer.lock b/composer.lock
index 763e256..2ca57b8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "984370377c96303e68539a8e7e4f0e88",
+    "content-hash": "47e1613c487408ebebee7ce06ae73204",
     "packages": [
         {
             "name": "magicalex/write-ini-file",
@@ -214,24 +214,26 @@
         },
         {
             "name": "phpgt/typesafegetter",
-            "version": "v1.2.4",
+            "version": "v1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PhpGt/TypeSafeGetter.git",
-                "reference": "ebffd758e69b8a0eebcad30f3daf408915b9ddf3"
+                "reference": "7874a16656a1aa77d5160cab239ac3f9618028f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PhpGt/TypeSafeGetter/zipball/ebffd758e69b8a0eebcad30f3daf408915b9ddf3",
-                "reference": "ebffd758e69b8a0eebcad30f3daf408915b9ddf3",
+                "url": "https://api.github.com/repos/PhpGt/TypeSafeGetter/zipball/7874a16656a1aa77d5160cab239ac3f9618028f4",
+                "reference": "7874a16656a1aa77d5160cab239ac3f9618028f4",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "v1.8.0",
-                "phpunit/phpunit": "v9.5.21"
+                "phpmd/phpmd": "^2.13",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^10.1",
+                "squizlabs/php_codesniffer": "^3.7"
             },
             "type": "library",
             "autoload": {
@@ -252,7 +254,7 @@
             "description": "An interface for objects that expose type-safe getter methods.",
             "support": {
                 "issues": "https://github.com/PhpGt/TypeSafeGetter/issues",
-                "source": "https://github.com/PhpGt/TypeSafeGetter/tree/v1.2.4"
+                "source": "https://github.com/PhpGt/TypeSafeGetter/tree/v1.3.0"
             },
             "funding": [
                 {
@@ -260,7 +262,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-07-08T17:17:42+00:00"
+            "time": "2023-04-27T14:52:28+00:00"
         }
     ],
     "packages-dev": [
@@ -1150,16 +1152,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.1.1",
+            "version": "10.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "0d9401b7e8245d71079e249e3cb868e9d2337887"
+                "reference": "6f0cd95be71add539f8fd2be25b2a4a29789000b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0d9401b7e8245d71079e249e3cb868e9d2337887",
-                "reference": "0d9401b7e8245d71079e249e3cb868e9d2337887",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6f0cd95be71add539f8fd2be25b2a4a29789000b",
+                "reference": "6f0cd95be71add539f8fd2be25b2a4a29789000b",
                 "shasum": ""
             },
             "require": {
@@ -1231,7 +1233,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.1.1"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.1.2"
             },
             "funding": [
                 {
@@ -1247,7 +1249,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-17T12:17:05+00:00"
+            "time": "2023-04-22T07:38:19+00:00"
         },
         {
             "name": "psr/container",
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..5e1b5d9
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<phpunit
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
+	colors="true"
+	cacheDirectory="test/phpunit/.phpunit.cache"
+	bootstrap="vendor/autoload.php"
+>
+	<coverage />
+
+	<testsuites>
+		<testsuite name="main">
+			<directory>
+				./test/phpunit/
+			</directory>
+		</testsuite>
+	</testsuites>
+
+	<logging />
+
+	<source>
+		<include>
+			<directory>
+				src/
+			</directory>
+		</include>
+	</source>
+</phpunit>
diff --git a/test/phpunit/phpunit.xml b/test/phpunit/phpunit.xml
deleted file mode 100644
index 274a19c..0000000
--- a/test/phpunit/phpunit.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory suffix=".php">../../src</directory>
-    </include>
-    <report>
-      <html outputDirectory="./_coverage" lowUpperBound="35" highLowerBound="70"/>
-      <text outputFile="php://stdout" showUncoveredFiles="true"/>
-    </report>
-  </coverage>
-  <testsuites>
-    <testsuite name="main">
-      <directory suffix="Test.php">.</directory>
-    </testsuite>
-  </testsuites>
-  <logging/>
-</phpunit>