From 8c4ace1f06fdb87b874482bc4beee4e002ef22d3 Mon Sep 17 00:00:00 2001
From: "@mpyw" <mpyw628@gmail.com>
Date: Sun, 14 Dec 2025 23:18:33 +0900
Subject: [PATCH 1/2] [Claude] Add PHP 8.5 to CI test matrix

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6cee0ca..24e45e3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [5.3, 5.4, 5.5, 5.6, '7.0', 7.1, 7.2, 7.3, 7.4, '8.0', 8.1, 8.2, 8.3, 8.4]
+        php: [5.3, 5.4, 5.5, 5.6, '7.0', 7.1, 7.2, 7.3, 7.4, '8.0', 8.1, 8.2, 8.3, 8.4, 8.5]
         flags: ['']
         include:
           - { php: 5.3, flags: --prefer-lowest }

From dd6a31c52f0c2da436762b396a4b091e6b079691 Mon Sep 17 00:00:00 2001
From: "@mpyw" <mpyw628@gmail.com>
Date: Mon, 15 Dec 2025 04:01:24 +0900
Subject: [PATCH 2/2] Add exclude-from-classmap to prevent class redeclaration

Fixes PHPUnit 12+ compatibility by excluding the original ComparisonFailure
class from the autoloader, ensuring the patched version is always used.
---
 composer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composer.json b/composer.json
index 01dd8cb..ebdc4ef 100644
--- a/composer.json
+++ b/composer.json
@@ -13,6 +13,9 @@
     "autoload": {
         "files": [
             "./files/ComparisonFailure.php"
+        ],
+        "exclude-from-classmap": [
+            "vendor/sebastian/comparator/src/ComparisonFailure.php"
         ]
     },
     "autoload-dev": {