Merge branch 'GravityPDF:main' into main

GravityPDF · Nov 14, 2024 · 3aba5fd · 3aba5fd
2 parents ebf16bc + 49f95fb
commit 3aba5fd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/unit-testing.yml b/.github/workflows/unit-testing.yml
@@ -7,9 +7,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
+        php-versions: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
         include:
-          - php: '8.2'
+          - php: '8.3'
             report: true
 
     name: PHP ${{ matrix.php-versions }} PHPUnit Test

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 QueryPath Changelog
 ===========================
 
+# Unreleased changes
+
+- Update composer.json to mark library as PHP 8.4 compatible
+
 # 4.0.1
 
 - Only define global functions qp(), htmlqp(), and html5qp() if they haven't been defined already.

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     }
   ],
   "require": {
-    "php": "^7.1 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
+    "php": "^7.1 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
     "masterminds/html5": "^2.0"
   },
   "autoload": {