From b86f6f980f820839d273c05e2845366fb868b109 Mon Sep 17 00:00:00 2001
From: Graham Campbell <GrahamCampbell@users.noreply.github.com>
Date: Thu, 18 Jul 2024 11:25:23 +0100
Subject: [PATCH] PHP 8.4 support (#171)

---
 .gitattributes                        | 1 +
 .github/workflows/ci.yml              | 2 +-
 composer.json                         | 2 +-
 psalm-baseline.xml                    | 2 ++
 psalm.xml                             | 3 +++
 vendor-bin/php-cs-fixer/composer.json | 2 +-
 vendor-bin/phpstan/composer.json      | 4 ++--
 vendor-bin/psalm/composer.json        | 2 +-
 8 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 psalm-baseline.xml

diff --git a/.gitattributes b/.gitattributes
index 5e3dd8c..faed8b0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,6 +6,7 @@
 /phpstan-baseline.neon  export-ignore
 /phpstan.neon.dist      export-ignore
 /phpunit.xml.dist       export-ignore
+/psalm-baseline.xml     export-ignore
 /psalm.xml              export-ignore
 /tests/                 export-ignore
 /vendor-bin/            export-ignore
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4851d6b..279bdcf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
     strategy:
       max-parallel: 10
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
 
     steps:
       - name: Set up PHP
diff --git a/composer.json b/composer.json
index 6c5bdd6..f64ed77 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8.2",
-        "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+        "phpunit/phpunit": "^8.5.39 || ^9.6.20"
     },
     "autoload": {
         "psr-4": {
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
new file mode 100644
index 0000000..7bf39a8
--- /dev/null
+++ b/psalm-baseline.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505"/>
diff --git a/psalm.xml b/psalm.xml
index 3e4e3d0..10238ae 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -5,6 +5,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    errorBaseline="psalm-baseline.xml"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />
diff --git a/vendor-bin/php-cs-fixer/composer.json b/vendor-bin/php-cs-fixer/composer.json
index 049eacf..72998c7 100644
--- a/vendor-bin/php-cs-fixer/composer.json
+++ b/vendor-bin/php-cs-fixer/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.4 || ^8.0",
-        "friendsofphp/php-cs-fixer": "3.52.1"
+        "friendsofphp/php-cs-fixer": "3.59.3"
     },
     "config": {
         "preferred-install": "dist"
diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json
index 6207691..77598be 100644
--- a/vendor-bin/phpstan/composer.json
+++ b/vendor-bin/phpstan/composer.json
@@ -1,8 +1,8 @@
 {
     "require": {
         "php": "^7.4 || ^8.0",
-        "phpstan/phpstan": "1.10.47",
-        "phpstan/phpstan-deprecation-rules": "1.1.4"
+        "phpstan/phpstan": "1.11.7",
+        "phpstan/phpstan-deprecation-rules": "1.2.0"
     },
     "config": {
         "preferred-install": "dist"
diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json
index 2f215e8..020abe5 100644
--- a/vendor-bin/psalm/composer.json
+++ b/vendor-bin/psalm/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.4 || ^8.0",
-        "psalm/phar": "5.16.0"
+        "psalm/phar": "5.25.0"
     },
     "config": {
         "preferred-install": "dist"