Merge pull request #15 from ingenerator/support-php84

Support PHP 8.4

Author: craig410

.gitattributes

@@ -30,7 +30,6 @@ README  text eol=lf
 
 # Ignore paths that should not be included in an archive (eg for a distribution version)
 /.github export-ignore
-/docs export-ignore
 /test export-ignore
 phpunit.xml export-ignore
 koharness.php export-ignore

.github/workflows/test.yaml

@@ -15,11 +15,11 @@ jobs:
       matrix:
         php_version:
         - '8.3'
-        dependencies:
+        - '8.4'
+        dependency-versions:
         - 'default'
-        include:
-        - php_version: '8.3'
-          dependencies: 'lowest'
+        - 'lowest'
+
     steps:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -28,29 +28,14 @@ jobs:
         tools: composer:v2
 
     - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Get composer cache directory
-      id: composer-cache
-      run: |
-        echo "::set-output name=dir::$(composer config cache-files-dir)"
-    - uses: actions/cache@v2
+      uses: actions/checkout@v4
       with:
-        path: ${{ steps.composer-cache.outputs.dir }}
-        key: ${{ runner.os }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-composer-${{ matrix.dependencies }}
+        show-progress: false
 
     - name: Install composer dependencies
-      env:
-        DEPENDENCIES: ${{ matrix.dependencies }}
-      run: |
-        if [ $DEPENDENCIES == 'lowest' ]
-        then
-          composer update --prefer-lowest --no-interaction --no-progress
-        else
-          composer install --no-interaction --no-progress
-        fi
+      uses: ramsey/composer-install@v3
+      with:
+        dependency-versions: ${{ matrix.dependency-versions }}
 
     - name: Run koharness
       run: |

CHANGELOG.md

@@ -1,5 +1,9 @@
 ### Unreleased
 
+### v2.1.0 (2025-07-22)
+
+* Support PHP 8.4
+
 ### v2.0.1 (2024-12-13)
 
 * Fix missing imports for behat step definitions broken in 2.0.0

composer.json

@@ -14,14 +14,14 @@
   "require": {
     "composer/installers": "^1.9",
     "ezyang/htmlpurifier": "^4.15",
-    "php": "~8.3.0",
+    "php": "~8.3.0 || ~8.4.0",
     "ingenerator/kohana-core": "^4.7",
     "ingenerator/kohana-extras": "^2.0 || ^3.0",
     "ingenerator/kohana-view": "^4.4"
   },
   "require-dev": {
     "kohana/koharness": "dev-master",
-    "phpunit/phpunit": "^11"
+    "phpunit/phpunit": "^11.5"
   },
   "repositories": [
     {
@@ -36,6 +36,7 @@
   },
   "config": {
     "preferred-install": "dist",
+    "sort-packages": true,
     "allow-plugins": {
       "composer/installers": true
     }