From 8242ba96e03f6572947b7a13de700700fc49ed1c Mon Sep 17 00:00:00 2001
From: Rob Allen <rob@akrabat.com>
Date: Fri, 31 Oct 2025 07:25:10 +0000
Subject: [PATCH 1/2] Fix PHP warning in test

We will render template.phtml before failing the when rendering the
layout template, so ensure that the variable defined in template.phtml
is defined to avoid the PHP warning.
---
 tests/PhpRendererTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/PhpRendererTest.php b/tests/PhpRendererTest.php
index 0e2284e..8aa3a0a 100644
--- a/tests/PhpRendererTest.php
+++ b/tests/PhpRendererTest.php
@@ -139,7 +139,9 @@ public function testExceptionInLayout(): void
         $body = $this->createStream();
         $response = new Response(200, $headers, $body);
         try {
-            $newResponse = $renderer->render($response, 'template.phtml');
+            $newResponse = $renderer->render($response, 'template.phtml', [
+                'hello' => 'Hi'
+            ]);
         } catch (Throwable $t) {
             // PHP 7+
             // Simulates an error template

From de68814b1052e789f575d922b934fbe0b7ac1c66 Mon Sep 17 00:00:00 2001
From: Rob Allen <rob@akrabat.com>
Date: Fri, 31 Oct 2025 07:26:20 +0000
Subject: [PATCH 2/2] Add PHP 8,4 and 8.5 to the CI test matrix

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index bfb02f3..009f2bd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 7.4, 8.0, 8.1, 8.2, 8.3 ]
+        php: [ 7.4, 8.0, 8.1, 8.2, 8.3, 8.4, 8.5 ]
 
     steps:
       - name: Checkout