Merge pull request #1863 from creative-commoners/pulls/3/php84

API Explicity mark nullable parameters for PHP 8.4
silverstripe · Dec 2, 2024 · de2d84c · de2d84c
2 parents 176b051 + f5aebe5
commit de2d84c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/code/FormSchemaController.php b/code/FormSchemaController.php
@@ -111,7 +111,7 @@ public function schema(HTTPRequest $request): HTTPResponse
      * @param ValidationResult $errors Required for 'error' response
      * @param array $extraData Any extra data to be merged with the schema response
      */
-    public function getSchemaResponse(string $schemaID, ?Form $form = null, ValidationResult $errors = null, array $extraData = []): HTTPResponse
+    public function getSchemaResponse(string $schemaID, ?Form $form = null, ?ValidationResult $errors = null, array $extraData = []): HTTPResponse
     {
         $parts = $this->getRequest()->getHeader(static::SCHEMA_HEADER);
         $data = $this

diff --git a/code/Forms/LinkFormFactory.php b/code/Forms/LinkFormFactory.php
@@ -27,7 +27,7 @@ abstract class LinkFormFactory implements FormFactory
      * @param array $context
      * @return Form
      */
-    public function getForm(RequestHandler $controller = null, $name = FormFactory::DEFAULT_NAME, $context = [])
+    public function getForm(?RequestHandler $controller = null, $name = FormFactory::DEFAULT_NAME, $context = [])
     {
         // Validate context
         foreach ($this->getRequiredContext() as $required) {