From e84d9c9abc3c42e9e5d5cef2fd71fd29db1a08f8 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Thu, 28 Nov 2024 14:01:56 +1300
Subject: [PATCH 1/2] API Explicity mark nullable parameters for PHP 8.4

---
 src/Forms/EditFormFactory.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Forms/EditFormFactory.php b/src/Forms/EditFormFactory.php
index 8455d94b..85bb883b 100644
--- a/src/Forms/EditFormFactory.php
+++ b/src/Forms/EditFormFactory.php
@@ -29,7 +29,7 @@ class EditFormFactory extends DefaultFormFactory
      */
     const FIELD_NAMESPACE_TEMPLATE = 'PageElements_%d_%s';
 
-    public function getForm(RequestHandler $controller = null, $name = EditFormFactory::DEFAULT_NAME, $context = [])
+    public function getForm(?RequestHandler $controller = null, $name = EditFormFactory::DEFAULT_NAME, $context = [])
     {
         $form = parent::getForm($controller, $name, $context);
 
@@ -44,7 +44,7 @@ public function getForm(RequestHandler $controller = null, $name = EditFormFacto
         return $form;
     }
 
-    protected function getFormFields(RequestHandler $controller = null, $name, $context = [])
+    protected function getFormFields(?RequestHandler $controller = null, $name, $context = [])
     {
         $fields = parent::getFormFields($controller, $name, $context);
 
@@ -58,7 +58,7 @@ protected function getFormFields(RequestHandler $controller = null, $name, $cont
         return $fields;
     }
 
-    protected function getFormValidator(RequestHandler $controller = null, $name, $context = [])
+    protected function getFormValidator(?RequestHandler $controller = null, $name, $context = [])
     {
         /** @var CompositeValidator $compositeValidator */
         $compositeValidator = parent::getFormValidator($controller, $name, $context);

From ae3197045f1f4f6f64461713111d56ad38767826 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Sun, 1 Dec 2024 19:38:45 +1300
Subject: [PATCH 2/2] API Make parameter non-optional for PHP 8.4

---
 src/Forms/EditFormFactory.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Forms/EditFormFactory.php b/src/Forms/EditFormFactory.php
index 85bb883b..328ad7b7 100644
--- a/src/Forms/EditFormFactory.php
+++ b/src/Forms/EditFormFactory.php
@@ -44,7 +44,7 @@ public function getForm(?RequestHandler $controller = null, $name = EditFormFact
         return $form;
     }
 
-    protected function getFormFields(?RequestHandler $controller = null, $name, $context = [])
+    protected function getFormFields(?RequestHandler $controller, $name, $context = [])
     {
         $fields = parent::getFormFields($controller, $name, $context);
 
@@ -58,7 +58,7 @@ protected function getFormFields(?RequestHandler $controller = null, $name, $con
         return $fields;
     }
 
-    protected function getFormValidator(?RequestHandler $controller = null, $name, $context = [])
+    protected function getFormValidator(?RequestHandler $controller, $name, $context = [])
     {
         /** @var CompositeValidator $compositeValidator */
         $compositeValidator = parent::getFormValidator($controller, $name, $context);