diff options
| -rw-r--r-- | apps/federatedfilesharing/tests/TokenHandlerTest.php | 4 | ||||
| -rw-r--r-- | lib/private/Security/SecureRandom.php | 7 | ||||
| -rw-r--r-- | lib/public/Security/ISecureRandom.php | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/apps/federatedfilesharing/tests/TokenHandlerTest.php b/apps/federatedfilesharing/tests/TokenHandlerTest.php index aca6c3d26c1..d6f3f8fe5da 100644 --- a/apps/federatedfilesharing/tests/TokenHandlerTest.php +++ b/apps/federatedfilesharing/tests/TokenHandlerTest.php @@ -55,9 +55,9 @@ class TokenHandlerTest extends \Test\TestCase { $this->expectedTokenLength, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS ) - ->willReturn(true); + ->willReturn('mytoken'); - $this->assertTrue($this->tokenHandler->generateToken()); + $this->assertSame('mytoken', $this->tokenHandler->generateToken()); } diff --git a/lib/private/Security/SecureRandom.php b/lib/private/Security/SecureRandom.php index 5bd909ea002..75d9d02a1d3 100644 --- a/lib/private/Security/SecureRandom.php +++ b/lib/private/Security/SecureRandom.php @@ -1,4 +1,5 @@ <?php +declare(strict_types=1); /** * @copyright Copyright (c) 2016, ownCloud, Inc. * @@ -70,9 +71,9 @@ class SecureRandom implements ISecureRandom { * specified all valid base64 characters are used. * @return string */ - public function generate($length, - $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/') { - $maxCharIndex = strlen($characters) - 1; + public function generate(int $length, + string $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'): string { + $maxCharIndex = \strlen($characters) - 1; $randomString = ''; while($length > 0) { diff --git a/lib/public/Security/ISecureRandom.php b/lib/public/Security/ISecureRandom.php index 76e207fbbd8..235b3033c44 100644 --- a/lib/public/Security/ISecureRandom.php +++ b/lib/public/Security/ISecureRandom.php @@ -1,4 +1,5 @@ <?php +declare(strict_types=1); /** * @copyright Copyright (c) 2016, ownCloud, Inc. * @@ -87,7 +88,7 @@ interface ISecureRandom { * @return string * @since 8.0.0 */ - public function generate($length, - $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'); + public function generate(int $length, + string $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'): string; } |