From 3a81ee15b8a027964dffb80f2becc0d94307bd32 Mon Sep 17 00:00:00 2001
From: Oliver Klee <github@oliverklee.de>
Date: Fri, 23 Aug 2024 16:53:00 +0200
Subject: [PATCH 1/2] [FEATURE] Add support for PHP 8.4

---
 .github/workflows/ci.yml | 2 ++
 CHANGELOG.md             | 1 +
 composer.json            | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 88ae0748..aef8937b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,6 +26,7 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
+          - '8.4'
 
     steps:
       - name: Checkout
@@ -184,6 +185,7 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
+          - '8.4'
         dependencies:
           - lowest
           - highest
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ec3aa7c..29715a89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Please also have a look at our
 
 ### Added
 
+- Add support for PHP 8.4 (#1278)
 - Support CSS custom properties (variables) (#1336)
 - Support `:root` pseudo-class (#1306)
 - Add CSS selectors exclusion feature (#1236)
diff --git a/composer.json b/composer.json
index 66739a59..93a11497 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,7 @@
         "source": "https://github.com/MyIntervals/emogrifier"
     },
     "require": {
-        "php": "~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "ext-dom": "*",
         "ext-libxml": "*",
         "sabberworm/php-css-parser": "^8.7.0",

From 450833c3c071879ab82a49193d54597ea5f004f7 Mon Sep 17 00:00:00 2001
From: Oliver Klee <github@oliverklee.de>
Date: Mon, 28 Oct 2024 09:33:51 +0100
Subject: [PATCH 2/2] Exclude unit tests with lowest dependencies for PHP 8.4
 in CI

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aef8937b..5f13ae59 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -189,6 +189,9 @@ jobs:
         dependencies:
           - lowest
           - highest
+        exclude:
+          - php-version: '8.4'
+            dependencies: lowest
 
     steps:
       - name: Checkout