From f55e775b62a9391da319476f3e2460f4bae4427d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Sat, 16 Nov 2024 21:27:53 +0100
Subject: [PATCH] Enhancement: Add support for PHP 8.4

---
 .github/settings.yml             |  3 +++
 .github/workflows/integrate.yaml |  1 +
 composer.json                    |  2 +-
 composer.lock                    | 18 +++++++++---------
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/settings.yml b/.github/settings.yml
index 1101b3c5..cdd27893 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -31,6 +31,9 @@ branches:
           - context: "Tests (8.3, highest)"
           - context: "Tests (8.3, locked)"
           - context: "Tests (8.3, lowest)"
+          - context: "Tests (8.4, highest)"
+          - context: "Tests (8.4, locked)"
+          - context: "Tests (8.4, lowest)"
         strict: false
       restrictions:
 
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index 9c6b57f4..9b5dbc4e 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -472,6 +472,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
 
         dependencies:
           - "lowest"
diff --git a/composer.json b/composer.json
index 6037dfc2..906774df 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     "security": "https://github.com/ergebnis/php-package-template/blob/main/.github/SECURITY.md"
   },
   "require": {
-    "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
+    "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.44.0",
diff --git a/composer.lock b/composer.lock
index faa3e815..aa1dbc66 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6c459d3904d2bcdc6022cf6c2f3a72db",
+    "content-hash": "656263209170eadca6f2b862b4d35699",
     "packages": [],
     "packages-dev": [
         {
@@ -3038,16 +3038,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.10",
+            "version": "1.12.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "fc463b5d0fe906dcf19689be692c65c50406a071"
+                "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/fc463b5d0fe906dcf19689be692c65c50406a071",
-                "reference": "fc463b5d0fe906dcf19689be692c65c50406a071",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6a60a4d66142b8156c9da923f1972657bc4748c",
+                "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c",
                 "shasum": ""
             },
             "require": {
@@ -3092,7 +3092,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-11-11T15:37:09+00:00"
+            "time": "2024-11-06T19:06:49+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",
@@ -7484,13 +7484,13 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "platform-overrides": {
         "php": "8.1.26"
     },