From f21b6ce9dd8f1f918aa3af394d6edaa26fb94241 Mon Sep 17 00:00:00 2001
From: Tom Mitchelmore <tom.mitchelmore@rareloop.com>
Date: Thu, 22 Oct 2026 09:14:57 +0100
Subject: [PATCH 1/3] Support illuminate/collections v11

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 63c8c1b..b4cbf9f 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
         "php": ">=8.1",
         "symfony/finder": "^6.4.24",
         "twig/twig": "^3.21.1",
-        "illuminate/collections": "^10",
+        "illuminate/collections": "^10 || ^11",
         "league/commonmark": "^2.7.1",
         "spatie/yaml-front-matter": "^2.1"
     },

From 0a5febc0c233dbbaae8ba742596feb407534e574 Mon Sep 17 00:00:00 2001
From: Tom Mitchelmore <tom.mitchelmore@rareloop.com>
Date: Thu, 22 Oct 2026 09:23:46 +0100
Subject: [PATCH 2/3] Update legacy CI

---
 .github/workflows/ci.yml | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4239750..c32163f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,24 +7,21 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php_version: ["8.1", "8.2", "8.3", "8.4"]
+                php_version: ["8.2", "8.3", "8.4", "8.5"]
                 composer_flags: ["", "--prefer-lowest"]
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php_version }}
                   extensions: xdebug
+                  tools: composer:v2
 
             - name: Install dependencies
-              uses: php-actions/composer@v5
-              with:
-                  php_version: ${{ matrix.php_version }}
-                  args: ${{ matrix.composer_flags }}
-                  command: update
+              run: composer update --no-interaction --prefer-dist ${{ matrix.composer_flags }}
 
             - name: Run tests
               run: ./vendor/bin/phpunit --coverage-clover ./tests/logs/clover.xml
@@ -33,14 +30,3 @@ jobs:
 
             - name: Run Codesniffer
               run: vendor/bin/phpcs --standard=PSR2 ./src
-
-        # - name: Submit coverage to Coveralls
-        #   # We use php-coveralls library for this, as the official Coveralls GitHub Action lacks support for clover reports:
-        #   # https://github.com/coverallsapp/github-action/issues/15
-        #   env:
-        #     COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        #     COVERALLS_PARALLEL: true
-        #     COVERALLS_FLAG_NAME: ${{ github.job }}-PHP-${{ matrix.php_version }} ${{ matrix.composer_flags }}
-        #   run: |
-        #     composer global require php-coveralls/php-coveralls
-        #     ~/.composer/vendor/bin/php-coveralls -v

From 323a54a3a5cfe3b13207a8fbb51d6ec5d1c2e293 Mon Sep 17 00:00:00 2001
From: Tom Mitchelmore <tom.mitchelmore@rareloop.com>
Date: Thu, 22 Oct 2026 09:25:46 +0100
Subject: [PATCH 3/3] Update CI triggers

---
 .github/workflows/ci.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c32163f..30a3ef5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,13 @@
 name: CI
 
-on: [push, pull_request]
+on:
+    push:
+        branches: [main]
+    pull_request:
+
+concurrency:
+    group: ci-${{ github.head_ref || github.ref }}
+    cancel-in-progress: true
 
 jobs:
     build-test: