Merge pull request #171 from creative-commoners/pulls/6/php84

API Explicity mark nullable parameters for PHP 8.4
silverstripe · Dec 2, 2024 · bc6398f · bc6398f
2 parents d466641 + 3428de0
commit bc6398f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Authenticator.php b/src/Authenticator.php
@@ -155,7 +155,7 @@ public function getLostPasswordHandler($link)
      * @param ValidationResult $result A validationresult which is either valid or contains the error message(s)
      * @return Member The matched member, or null if the authentication fails
      */
-    public function authenticate(array $data, HTTPRequest $request, ValidationResult &$result = null)
+    public function authenticate(array $data, HTTPRequest $request, ?ValidationResult &$result = null)
     {
         try {
             $this->service->enforceLogin($request);
@@ -189,7 +189,7 @@ public function authenticate(array $data, HTTPRequest $request, ValidationResult
      * @param ValidationResult $result
      * @return ValidationResult
      */
-    public function checkPassword(Member $member, $password, ValidationResult &$result = null)
+    public function checkPassword(Member $member, $password, ?ValidationResult &$result = null)
     {
         // No-op
     }

diff --git a/src/RealMeService.php b/src/RealMeService.php
@@ -907,7 +907,7 @@ private function getRequestedAuthnContext()
      *
      * @return Auth
      */
-    public function getAuth(HTTPRequest $request = null)
+    public function getAuth(?HTTPRequest $request = null)
     {
         if (isset($this->auth)) {
             return $this->auth;