From 54c84515b2b50b65558a64b427cec161516913e7 Mon Sep 17 00:00:00 2001
From: Brian Sweeney <brian@eclecticgeek.com>
Date: Sat, 14 Dec 2024 13:36:40 -0500
Subject: [PATCH] Update unit test configuration

- normalizes github actions yml based on the Dompdf project
- adds support for phpunit 11
---
 .github/workflows/phpunit.yml   | 61 +++++++++++++++------------------
 composer.json                   |  5 +--
 phpunit.xml.dist => phpunit.xml |  0
 3 files changed, 29 insertions(+), 37 deletions(-)
 rename phpunit.xml.dist => phpunit.xml (100%)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 96b6dc0..b352546 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -1,43 +1,38 @@
-name: PHPUnit tests
+name: "Run unit tests"
 
 on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+  - push
+  - pull_request
+  - workflow_dispatch
 
-jobs:
-  php-version:
+env:
+  COMPOSER_MEMORY_LIMIT: -1
 
+jobs:
+  test:
+    name: "Build"
     runs-on: ubuntu-latest
 
     strategy:
-      fail-fast: false
+      max-parallel: 12
       matrix:
-        php-version:
-          - "7.1"
-          - "7.2"
-          - "7.3"
-          - "7.4"
-          - "8.0"
-          - "8.1"
-          - "8.2"
-          - "8.3"
-          - "8.4"
+        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        package-release: [dist]
 
     steps:
-
-        - uses: actions/checkout@v4
-
-        - name: Install PHP
-          uses: "shivammathur/setup-php@v2"
-          with:
-            php-version: "${{ matrix.php-version }}"
-            coverage: "none"
-            ini-values: "zend.assertions=1"
-
-        - name: Install Composer dependencies
-          run: composer install --no-progress --ansi
-
-        - name: Run tests ${{ matrix.php-version }}
-          run: SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1 bin/simple-phpunit --color=always
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup PHP ${{ matrix.php }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: exif,json,mbstring,dom
+
+      - name: Install composer dependencies
+        uses: ramsey/composer-install@v3
+        with:
+          dependency-versions: ${{ matrix.package-release }}
+
+      - name: Run unit tests
+        run: ./vendor/bin/phpunit
diff --git a/composer.json b/composer.json
index 934bb00..ee7a971 100644
--- a/composer.json
+++ b/composer.json
@@ -20,14 +20,11 @@
             "FontLib\\Tests\\": "tests/FontLib"
         }
     },
-    "config": {
-        "bin-dir": "bin"
-    },
     "require": {
         "php": "^7.1 || ^8.0",
         "ext-mbstring": "*"
     },
     "require-dev": {
-        "symfony/phpunit-bridge" : "^3 || ^4 || ^5 || ^6"
+        "phpunit/phpunit": "^7.5 || ^8 || ^9 || ^10 || ^11"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml
similarity index 100%
rename from phpunit.xml.dist
rename to phpunit.xml