From db546ffcae3b0bfc8716e4eb86916a6a97e3e035 Mon Sep 17 00:00:00 2001
From: Rob Allen <rob@akrabat.com>
Date: Sun, 2 Nov 2025 14:25:59 +0000
Subject: [PATCH 1/2] Remove .travis.yml

---
 .travis.yml | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 5567a82..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-language: php
-dist: trusty
-
-matrix:
-  include:
-    - php: 7.2
-    - php: 7.3
-    - php: 7.4
-      env: ANALYSIS='true'
-    - php: nightly
-
-  allow_failures:
-    - php: nightly
-
-before_script:
-  - if [[ "$ANALYSIS" == 'true' ]]; then composer require php-coveralls/php-coveralls:^2.1.0 ; fi
-  - composer install -n
-
-script:
-  - if [[ "$ANALYSIS" != 'true' ]]; then vendor/bin/phpunit ; fi
-  - if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/phpunit --coverage-clover clover.xml ; fi
-  - if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/phpcs ; fi
-  - if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/phpstan analyse src ; fi
-
-after_success:
-  - if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/php-coveralls --coverage_clover=clover.xml -v ; fi

From 6d33186f568158301b6038564f95fa5931a54250 Mon Sep 17 00:00:00 2001
From: Rob Allen <rob@akrabat.com>
Date: Sun, 2 Nov 2025 14:28:28 +0000
Subject: [PATCH 2/2] Support PHP 8.4 & 8.5 in CI

---
 .github/workflows/tests.yml | 4 ++--
 tests/CacheTest.php         | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f980814..30c656a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,9 +9,9 @@ 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]
         include:
-          - php: 8.2
+          - php: 8.4
             analysis: true
 
     steps:
diff --git a/tests/CacheTest.php b/tests/CacheTest.php
index 64fab81..47b595c 100644
--- a/tests/CacheTest.php
+++ b/tests/CacheTest.php
@@ -43,7 +43,7 @@ protected function createResponse(): ResponseInterface
      *
      * @return RequestHandlerInterface
      */
-    protected function createRequestHandler(ResponseInterface $response = null): RequestHandlerInterface
+    protected function createRequestHandler(?ResponseInterface $response): RequestHandlerInterface
     {
         $response = $response ?? $this->createResponse();
 
@@ -67,7 +67,7 @@ public function testCacheControlHeader()
         $cache = new Cache('public', 86400);
         $req = $this->requestFactory();
 
-        $res = $cache->process($req, $this->createRequestHandler());
+        $res = $cache->process($req, $this->createRequestHandler(null));
 
         $cacheControl = $res->getHeaderLine('Cache-Control');
 
@@ -79,7 +79,7 @@ public function testCacheControlHeaderWithMustRevalidate()
         $cache = new Cache('private', 86400, true);
         $req = $this->requestFactory();
 
-        $res = $cache->process($req, $this->createRequestHandler());
+        $res = $cache->process($req, $this->createRequestHandler(null));
 
         $cacheControl = $res->getHeaderLine('Cache-Control');
 
@@ -91,7 +91,7 @@ public function testCacheControlHeaderWithZeroMaxAge()
         $cache = new Cache('private', 0, false);
         $req = $this->requestFactory();
 
-        $res = $cache->process($req, $this->createRequestHandler());
+        $res = $cache->process($req, $this->createRequestHandler(null));
 
         $cacheControl = $res->getHeaderLine('Cache-Control');