From 907edd2099c41790404861de66db2f0e0a1c2771 Mon Sep 17 00:00:00 2001
From: Jay Klehr <jay@diablomedia.com>
Date: Wed, 17 Apr 2024 09:23:31 -0600
Subject: [PATCH] Preparing for PHP 8.3 (#203)

---
 .github/workflows/build.yml                 |  8 +++----
 .github/workflows/dependabot-auto-merge.yml |  2 +-
 .gitignore                                  |  1 +
 composer.json                               | 10 ++++-----
 phpunit.xml.dist                            | 24 +++++++++++++++------
 5 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 383b75c..3bb173d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,14 +13,14 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ["7.4", "8.0", "8.1", "8.2"]
+        php-versions: ["8.0", "8.1", "8.2", "8.3"]
         composer-args: ["", "--prefer-lowest"]
     runs-on: ${{ matrix.operating-system }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.25.1
+        uses: shivammathur/setup-php@2.30.2
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring
@@ -32,7 +32,7 @@ jobs:
         id: composer-cache
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: php${{ matrix.php-versions }}-composer-${{ matrix.composer-args }}-${{ hashFiles('**/composer.json') }}
diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml
index cc4b7bf..3aaaca1 100644
--- a/.github/workflows/dependabot-auto-merge.yml
+++ b/.github/workflows/dependabot-auto-merge.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1
+        uses: dependabot/fetch-metadata@v2
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Enable auto-merge for Dependabot PRs
diff --git a/.gitignore b/.gitignore
index e5b8007..6a8821b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 .php_cs.cache
 .phpunit.result.cache
 .php-cs-fixer.cache
+.phpunit.cache
\ No newline at end of file
diff --git a/composer.json b/composer.json
index d01a7ab..9849b75 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
     "prefer-stable": true,
     "require": {
         "ext-ctype": "*",
-        "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0",
+        "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
         "diablomedia/zendframework1-exception": "^1.0.0",
         "diablomedia/zendframework1-config": "^1.0.0 || ^2.0.0",
         "diablomedia/zendframework1-loader": "^1.0.0",
@@ -31,11 +31,11 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5.10",
-        "phpstan/phpstan": "1.10.15",
-        "friendsofphp/php-cs-fixer": "3.16.0",
+        "phpunit/phpunit": "^9.6.19 || ^10.5.18",
+        "phpstan/phpstan": "1.10.67",
+        "friendsofphp/php-cs-fixer": "3.53.0",
         "maglnet/composer-require-checker": "^3.0.0",
-        "phpro/grumphp-shim": "^1.5.0"
+        "phpro/grumphp-shim": "^2.0.0"
     },
     "include-path": [
         "src/"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d55ddf3..d97fc9c 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,13 +1,25 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" beStrictAboutTestsThatDoNotTestAnything="true" backupGlobals="true" stderr="true" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage includeUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">./src</directory>
-    </include>
-  </coverage>
+<phpunit 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+  beStrictAboutTestsThatDoNotTestAnything="true" 
+  backupGlobals="true" 
+  stderr="true" 
+  colors="true" 
+  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" 
+  cacheDirectory=".phpunit.cache"
+  displayDetailsOnTestsThatTriggerDeprecations="true" 
+  displayDetailsOnTestsThatTriggerErrors="true" 
+  displayDetailsOnTestsThatTriggerNotices="true" 
+  displayDetailsOnTestsThatTriggerWarnings="true" 
+>
   <testsuites>
     <testsuite name="default">
       <directory>./tests</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>