tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '5.1' into 5.2

This commit is contained in:
github-actions 2024-04-03 05:54:35 +00:00
parent 74abb03133 cca2f7059b
commit 97a8da8c7d
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Core/Manifest/ModuleResourceLoader.php
View File

@ -19,7 +19,7 @@ class ModuleResourceLoader implements TemplateGlobalProvider
* For other files, return original value * For other files, return original value
* *
* @param string $resource * @param string $resource
* @return string * @return string|null
*/ */
public function resolvePath($resource) public function resolvePath($resource)
{ {
@ -38,7 +38,7 @@ class ModuleResourceLoader implements TemplateGlobalProvider
* Resolves resource specifier to the given url. * Resolves resource specifier to the given url.
* *
* @param string $resource * @param string $resource
* @return string * @return string|null
*/ */
public function resolveURL($resource) public function resolveURL($resource)
{ {
@ -59,7 +59,7 @@ class ModuleResourceLoader implements TemplateGlobalProvider
* Template wrapper for resolvePath * Template wrapper for resolvePath
* *
* @param string $resource * @param string $resource
* @return string * @return string|null
*/ */
public static function resourcePath($resource) public static function resourcePath($resource)
{ {
@ -70,7 +70,7 @@ class ModuleResourceLoader implements TemplateGlobalProvider
* Template wrapper for resolveURL * Template wrapper for resolveURL
* *
* @param string $resource * @param string $resource
* @return string * @return string|null
*/ */
public static function resourceURL($resource) public static function resourceURL($resource)
{ {

7
src/Security/Member.php
View File

@ -391,7 +391,7 @@ class Member extends DataObject
/** /**
* Returns the default {@link PasswordValidator} * Returns the default {@link PasswordValidator}
* *
* @return PasswordValidator * @return PasswordValidator|null
*/ */
public static function password_validator() public static function password_validator()
{ {
@ -576,8 +576,7 @@ class Member extends DataObject
* @param string $hash The hash key * @param string $hash The hash key
* @param bool $login Should the member be logged in? * @param bool $login Should the member be logged in?
* *
* @return Member the matching member, if valid * @return Member|null the matching member, if valid or null
* @return Member
*/ */
public static function member_from_autologinhash($hash, $login = false) public static function member_from_autologinhash($hash, $login = false)
{ {
@ -597,7 +596,7 @@ class Member extends DataObject
* Find a member record with the given TempIDHash value * Find a member record with the given TempIDHash value
* *
* @param string $tempid * @param string $tempid
* @return Member * @return Member|null the matching member, if valid or null
*/ */
public static function member_from_tempid($tempid) public static function member_from_tempid($tempid)
{ {