API Make parameter non-optional for PHP 8.4

creative-commoners · Dec 1, 2024 · 1a3db3d · 1a3db3d
1 parent a315cbe
commit 1a3db3d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Forms/DefaultFormFactory.php b/src/Forms/DefaultFormFactory.php
@@ -64,7 +64,7 @@ public function getForm(?RequestHandler $controller = null, $name = FormFactory:
      * @param array $context
      * @return FieldList
      */
-    protected function getFormFields(?RequestHandler $controller = null, $name, $context = [])
+    protected function getFormFields(?RequestHandler $controller, $name, $context = [])
     {
         // Fall back to standard "getCMSFields" which itself uses the FormScaffolder as a fallback
         $fields = $context['Record']->getCMSFields();
@@ -80,7 +80,7 @@ protected function getFormFields(?RequestHandler $controller = null, $name, $con
      * @param array $context
      * @return FieldList
      */
-    protected function getFormActions(?RequestHandler $controller = null, $name, $context = [])
+    protected function getFormActions(?RequestHandler $controller, $name, $context = [])
     {
         $actions = $context['Record']->getCMSActions();
         $this->invokeWithExtensions('updateFormActions', $actions, $controller, $name, $context);
@@ -93,7 +93,7 @@ protected function getFormActions(?RequestHandler $controller = null, $name, $co
      * @param array $context
      * @return null|Validator
      */
-    protected function getFormValidator(?RequestHandler $controller = null, $name, $context = [])
+    protected function getFormValidator(?RequestHandler $controller, $name, $context = [])
     {
         if (!$context['Record'] instanceof DataObject) {
             return null;

diff --git a/tests/php/Forms/FormFactoryTest/EditFormFactory.php b/tests/php/Forms/FormFactoryTest/EditFormFactory.php
@@ -18,7 +18,7 @@ class EditFormFactory extends DefaultFormFactory
         ControllerExtension::class
     ];
 
-    protected function getFormFields(?RequestHandler $controller = null, $name, $context = [])
+    protected function getFormFields(?RequestHandler $controller, $name, $context = [])
     {
         $fields = new FieldList(
             new HiddenField('ID'),
@@ -28,7 +28,7 @@ protected function getFormFields(?RequestHandler $controller = null, $name, $con
         return $fields;
     }
 
-    protected function getFormActions(?RequestHandler $controller = null, $name, $context = [])
+    protected function getFormActions(?RequestHandler $controller, $name, $context = [])
     {
         $actions = new FieldList(
             new FormAction('save', 'Save')