From 9d335f73d6853281ef4bd1a66e353dfd13a7b945 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Wed, 31 Jan 2024 10:34:25 +1300
Subject: [PATCH] NEW HasOneRelationFieldInterface

---
 src/Forms/HasOneRelationFieldInterface.php | 11 +++++++++++
 src/Forms/RequiredFields.php               |  3 ++-
 src/Forms/TreeDropdownField.php            |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 src/Forms/HasOneRelationFieldInterface.php

diff --git a/src/Forms/HasOneRelationFieldInterface.php b/src/Forms/HasOneRelationFieldInterface.php
new file mode 100644
index 000000000..b520cc959
--- /dev/null
+++ b/src/Forms/HasOneRelationFieldInterface.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace SilverStripe\Forms;
+
+/**
+ * Added to form fields whose values are the ID of a has_one relation
+ * This is used in RequiredFields validation to check if the value is set
+ */
+interface HasOneRelationFieldInterface
+{
+}
diff --git a/src/Forms/RequiredFields.php b/src/Forms/RequiredFields.php
index 3f817aa49..9bb3e7488 100644
--- a/src/Forms/RequiredFields.php
+++ b/src/Forms/RequiredFields.php
@@ -2,6 +2,7 @@
 
 namespace SilverStripe\Forms;
 
+use SilverStripe\LinkField\Form\LinkField;
 use SilverStripe\ORM\ArrayLib;
 
 /**
@@ -117,7 +118,7 @@ class RequiredFields extends Validator
                 }
             } else {
                 $stringValue = (string) $value;
-                if ($formField instanceof TreeDropdownField) {
+                if (is_a($formField, HasOneRelationFieldInterface::class)) {
                     // test for blank string as well as '0' because older versions of silverstripe/admin FormBuilder
                     // forms created using redux-form would have a value of null for unsaved records
                     // the null value will have been converted to '' by the time it gets to this point
diff --git a/src/Forms/TreeDropdownField.php b/src/Forms/TreeDropdownField.php
index d50e22772..b2f9952c9 100644
--- a/src/Forms/TreeDropdownField.php
+++ b/src/Forms/TreeDropdownField.php
@@ -55,7 +55,7 @@ use SilverStripe\ORM\Hierarchy\MarkedSet;
  * @see CheckboxSetField for multiple selections through checkboxes.
  * @see OptionsetField for single selections via radiobuttons.
  */
-class TreeDropdownField extends FormField
+class TreeDropdownField extends FormField implements HasOneRelationFieldInterface
 {
     protected $schemaDataType = self::SCHEMA_DATA_TYPE_SINGLESELECT;