mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge pull request #10607 from creative-commoners/pulls/5/broken-builds
MNT Linting
This commit is contained in:
commit
bf440e42e7
@ -752,7 +752,7 @@ abstract class Database
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Commit everything inside this transaction so far
|
* Commit everything inside this transaction so far
|
||||||
*
|
*
|
||||||
* Boolean is returned if success state is known, or null if
|
* Boolean is returned if success state is known, or null if
|
||||||
* unknown. Note: For error checking purposes null should not be treated as error.
|
* unknown. Note: For error checking purposes null should not be treated as error.
|
||||||
*/
|
*/
|
||||||
|
@ -501,7 +501,7 @@ class Member extends DataObject
|
|||||||
/**
|
/**
|
||||||
* Generate an auto login token which can be used to reset the password,
|
* Generate an auto login token which can be used to reset the password,
|
||||||
* at the same time hashing it and storing in the database.
|
* at the same time hashing it and storing in the database.
|
||||||
*
|
*
|
||||||
* @return string Token that should be passed to the client (but NOT persisted).
|
* @return string Token that should be passed to the client (but NOT persisted).
|
||||||
*/
|
*/
|
||||||
public function generateAutologinTokenAndStoreHash()
|
public function generateAutologinTokenAndStoreHash()
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
namespace SilverStripe\Security;
|
namespace SilverStripe\Security;
|
||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convenience class for generating cryptographically secure pseudo-random strings/tokens
|
* Convenience class for generating cryptographically secure pseudo-random strings/tokens
|
||||||
*/
|
*/
|
||||||
|
@ -325,7 +325,7 @@ class Requirements implements Flushable
|
|||||||
* 'framework/javascript/lang'
|
* 'framework/javascript/lang'
|
||||||
* @param bool $return Return all relative file paths rather than including them in
|
* @param bool $return Return all relative file paths rather than including them in
|
||||||
* requirements
|
* requirements
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public static function add_i18n_javascript($langDir, $return = false)
|
public static function add_i18n_javascript($langDir, $return = false)
|
||||||
|
Loading…
Reference in New Issue
Block a user