Merge branch '5.2' into 5

silverstripe · Apr 3, 2024 · 39c9e0d · 39c9e0d
2 parents b442d9d + 97a8da8
commit 39c9e0d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/Core/Manifest/ModuleResourceLoader.php b/src/Core/Manifest/ModuleResourceLoader.php
@@ -19,7 +19,7 @@ class ModuleResourceLoader implements TemplateGlobalProvider
      * For other files, return original value
      *
      * @param string $resource
-     * @return string
+     * @return string|null
      */
     public function resolvePath($resource)
     {
@@ -38,7 +38,7 @@ public function resolvePath($resource)
      * Resolves resource specifier to the given url.
      *
      * @param string $resource
-     * @return string
+     * @return string|null
      */
     public function resolveURL($resource)
     {
@@ -59,7 +59,7 @@ public function resolveURL($resource)
      * Template wrapper for resolvePath
      *
      * @param string $resource
-     * @return string
+     * @return string|null
      */
     public static function resourcePath($resource)
     {
@@ -70,7 +70,7 @@ public static function resourcePath($resource)
      * Template wrapper for resolveURL
      *
      * @param string $resource
-     * @return string
+     * @return string|null
      */
     public static function resourceURL($resource)
     {

diff --git a/src/Security/Member.php b/src/Security/Member.php
@@ -391,7 +391,7 @@ public static function set_password_validator(PasswordValidator $validator = nul
     /**
      * Returns the default {@link PasswordValidator}
      *
-     * @return PasswordValidator
+     * @return PasswordValidator|null
      */
     public static function password_validator()
     {
@@ -576,8 +576,7 @@ public function validateAutoLoginToken($autologinToken)
      * @param string $hash The hash key
      * @param bool $login Should the member be logged in?
      *
-     * @return Member the matching member, if valid
-     * @return Member
+     * @return Member|null the matching member, if valid or null
      */
     public static function member_from_autologinhash($hash, $login = false)
     {
@@ -597,7 +596,7 @@ public static function member_from_autologinhash($hash, $login = false)
      * Find a member record with the given TempIDHash value
      *
      * @param string $tempid
-     * @return Member
+     * @return Member|null the matching member, if valid or null
      */
     public static function member_from_tempid($tempid)
     {