From 62ac68814d57c2b63565c7a0b745f51864807c5a Mon Sep 17 00:00:00 2001
From: Phillip Davis <phil@jankaritech.com>
Date: Fri, 4 Sep 2026 12:46:38 +0930
Subject: [PATCH 1/2] chore: set failOnDeprecation in phpunit

Signed-off-by: Phillip Davis <phil@jankaritech.com>
---
 tests/phpunit.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 6d940533a..8afdb308d 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0"?>
-<phpunit colors="true" bootstrap="bootstrap.php" beStrictAboutTestsThatDoNotTestAnything="true" beStrictAboutOutputDuringTests="true" failOnRisky="true" failOnWarning="true" enforceTimeLimit="true" cacheDirectory=".phpunit.cache">
+<phpunit colors="true"
+         bootstrap="bootstrap.php"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutOutputDuringTests="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         failOnDeprecation="true"
+         enforceTimeLimit="true"
+         cacheDirectory=".phpunit.cache"
+>
   <php>
     <ini name="error_reporting" value="E_ALL"/>
   </php>

From 0ab36909792d08c7729e12c645362918a0dd9aa2 Mon Sep 17 00:00:00 2001
From: Phillip Davis <phil@jankaritech.com>
Date: Fri, 4 Sep 2026 12:56:37 +0930
Subject: [PATCH 2/2] fix: when group is null set it to the empty string

This avoids deprecation warnings from phpunit in PHP 8.5 about
the code using the null value of group as an array key.

Note that in PHP 8, trying to use null as an array key results
in the empty string being used as the array key. So this was the
underlying behavior anyway, but better to now explicitly use the
empty string.

Signed-off-by: Phillip Davis <phil@jankaritech.com>
---
 lib/Component/VCard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Component/VCard.php b/lib/Component/VCard.php
index bbb852cc2..0b8696fd4 100644
--- a/lib/Component/VCard.php
+++ b/lib/Component/VCard.php
@@ -479,7 +479,7 @@ public function xmlSerialize(Xml\Writer $writer): void
         $propertiesByGroup = [];
 
         foreach ($this->children() as $property) {
-            $group = $property->group;
+            $group = $property->group ?? '';
 
             $propertiesByGroup[$group] ??= [];