diff --git a/apps/federatedfilesharing/tests/TokenHandlerTest.php b/apps/federatedfilesharing/tests/TokenHandlerTest.php
index aca6c3d26c..d6f3f8fe5d 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 b5270d08b4..75d9d02a1d 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.
  *
@@ -21,8 +22,6 @@
  *
  */
 
-declare(strict_types=1);
-
 namespace OC\Security;
 
 use OCP\Security\ISecureRandom;
diff --git a/lib/public/Security/ISecureRandom.php b/lib/public/Security/ISecureRandom.php
index 14976831a1..235b3033c4 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.
  *
@@ -23,8 +24,6 @@
  *
  */
 
-declare(strict_types=1);
-
 namespace OCP\Security;
 
 /**