Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years ago · 6e1ee1e7a7
parent de5d7aa331
commit 6e1ee1e7a7
3 changed files with 4 additions and 6 deletions
--- 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());

 	}

--- 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.
 *
@ -21,8 +22,6 @@
 *
 */

-declare(strict_types=1);
-
 namespace OC\Security;

 use OCP\Security\ISecureRandom;
--- 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.
 *
@ -23,8 +24,6 @@
 *
 */

-declare(strict_types=1);
-
 namespace OCP\Security;

 /**