From a301406be871eb85c5f0f3f675c64ba888327e97 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Wed, 26 Nov 2025 15:43:32 +1300
Subject: [PATCH] ENH PHP 8.5 Support

---
 code/Model/Recipient/EmailRecipient.php                     | 3 +--
 tests/behat/features/userforms.feature                      | 1 +
 tests/php/Control/UserDefinedFormControllerTest.php         | 2 --
 tests/php/Model/EditableFormField/EditableFileFieldTest.php | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/code/Model/Recipient/EmailRecipient.php b/code/Model/Recipient/EmailRecipient.php
index 12327959..50441673 100644
--- a/code/Model/Recipient/EmailRecipient.php
+++ b/code/Model/Recipient/EmailRecipient.php
@@ -533,8 +533,7 @@ public function canSend($data, $form)
      */
     public function emailTemplateExists($template = '')
     {
-        $t = ($template ? $template : $this->EmailTemplate);
-
+        $t = ($template ? $template : $this->EmailTemplate) ?? '';
         return array_key_exists($t, (array) $this->getEmailTemplateDropdownValues());
     }
 
diff --git a/tests/behat/features/userforms.feature b/tests/behat/features/userforms.feature
index 2e015b1c..fa2fdfdc 100644
--- a/tests/behat/features/userforms.feature
+++ b/tests/behat/features/userforms.feature
@@ -71,6 +71,7 @@ Feature: Userforms
     Then I drag the ".ss-gridfield-item[data-id='4'] .handle" element to the ".ss-gridfield-item[data-id='6'] .handle" element
     And I wait for 1 seconds
     And I press the "Publish" button
+    And I wait for 1 seconds
     And I dismiss all toasts
 
     # Add email recipient with custom text and custom rules
diff --git a/tests/php/Control/UserDefinedFormControllerTest.php b/tests/php/Control/UserDefinedFormControllerTest.php
index 22bae6e4..383df05f 100644
--- a/tests/php/Control/UserDefinedFormControllerTest.php
+++ b/tests/php/Control/UserDefinedFormControllerTest.php
@@ -631,8 +631,6 @@ public function testValidEmailsToArray(array $input, array $expected)
     {
         $class = new ReflectionClass(UserDefinedFormController::class);
         $method = $class->getMethod('validEmailsToArray');
-        $method->setAccessible(true);
-
         $controller = new UserDefinedFormController();
 
         $this->assertEquals($expected, $method->invokeArgs($controller, $input));
diff --git a/tests/php/Model/EditableFormField/EditableFileFieldTest.php b/tests/php/Model/EditableFormField/EditableFileFieldTest.php
index d0595f68..4f1653da 100644
--- a/tests/php/Model/EditableFormField/EditableFileFieldTest.php
+++ b/tests/php/Model/EditableFormField/EditableFileFieldTest.php
@@ -84,7 +84,7 @@ public function testOnBeforeWrite()
         $defaultFolder = Folder::find('Form-submissions');
         $this->assertNotEmpty($defaultFolder, 'Default Folder was created along with the EditableFileField');
         $this->assertFalse($defaultFolder->canView(), 'Default Folder default to being restricted');
-        $this->assertFalse((boolean)$fileField->FolderConfirmed, 'EditableFileField are not Folder Confirmed initially');
+        $this->assertFalse((bool) $fileField->FolderConfirmed, 'EditableFileField are not Folder Confirmed initially');
 
         $this->assertEquals(
             $defaultFolder->ID,
@@ -95,7 +95,7 @@ public function testOnBeforeWrite()
         $fileField->FolderID = Folder::find_or_make('boom')->ID;
         $fileField->write();
         $this->assertTrue(
-            (boolean)$fileField->FolderConfirmed,
+            (bool) $fileField->FolderConfirmed,
             'EditableFileField are Folder Confirmed once you assigned them a folder'
         );