diff --git a/.editorconfig b/.editorconfig
index 18d54a7..8b8237f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -17,6 +17,6 @@ end_of_line = crlf
 indent_style = space
 indent_size = 4
 
-[*.md]
+[*.{md,yml}]
 indent_style = space
 indent_size = 2
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 93a4c01..4fb1153 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -5,20 +5,25 @@ on: [push, pull_request]
 permissions:
   contents: read
 
+env:
+  COMPOSER_ROOT_VERSION: dev-main
+
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Validate composer.json and composer.lock
-      run: composer validate --strict
+      uses: php-actions/composer@v6
+      with:
+        command: validate --strict
 
     - name: Cache Composer packages
       id: composer-cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: vendor
         key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
@@ -26,10 +31,12 @@ jobs:
           ${{ runner.os }}-php-
 
     - name: Install dependencies
-      run: composer install --prefer-dist --no-progress
+      uses: php-actions/composer@v6
+      with:
+        args: --prefer-dist --no-progress
 
     # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
     # Docs: https://getcomposer.org/doc/articles/scripts.md
 
     - name: Run test suite
-      run: composer run-script test
+      uses: php-actions/phpunit@v4
diff --git a/.gitignore b/.gitignore
index 55a0dbc..5362964 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ Thumbs.db
 /vendor
 /tmp
 .phpunit.cache
+.phpunit.*.cache
 .workflows
 /.vscode
 /composer.lock
diff --git a/phpunit.xml b/phpunit.xml
index 4855da9..3738fb9 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -2,7 +2,6 @@
 <phpunit
   bootstrap="vendor/autoload.php"
   colors="true"
-  cacheResultFile=".phpunit.cache"
   displayDetailsOnTestsThatTriggerDeprecations="true"
   displayDetailsOnTestsThatTriggerErrors="true"
   displayDetailsOnTestsThatTriggerNotices="true"