From 77bd4cf1804a4bfcc77b8eb7ce186963c8ddc14c Mon Sep 17 00:00:00 2001 From: Andrew Foster Date: Fri, 27 Jun 2025 17:17:17 +1000 Subject: [PATCH 1/2] Flatten nulls to empty string for preg_match --- .../PropertyModifier/PropertyModifierRejectOrSelect.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php b/library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php index 04c49c57f..1ff12ae7c 100644 --- a/library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php +++ b/library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php @@ -77,6 +77,9 @@ public static function addSettingsFormFields(QuickForm $form) public function matchesRegexp($string, $expression) { + if ($string === null) { + $string = (string) $string; + } return preg_match($expression, $string); } From 5ecfe2f1cab4702b44c3ba7c666b34206fbf8d93 Mon Sep 17 00:00:00 2001 From: Andrew Foster Date: Fri, 27 Jun 2025 17:35:08 +1000 Subject: [PATCH 2/2] We know the result --- .../PropertyModifier/PropertyModifierRejectOrSelect.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php b/library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php index 1ff12ae7c..0a18ec8a9 100644 --- a/library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php +++ b/library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php @@ -78,9 +78,9 @@ public static function addSettingsFormFields(QuickForm $form) public function matchesRegexp($string, $expression) { if ($string === null) { - $string = (string) $string; + $string = ''; } - return preg_match($expression, $string); + return preg_match($expression, (string) $string); } public function isNull($string, $expression)