Add strict types and fix tests

Signed-off-by: Christoph Wurst <[email protected]>

lib/Activity/Provider.php

@@ -1,8 +1,10 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * @author Christoph Wurst <[email protected]>
- * @copyright Copyright (c) 2016 Christoph Wurst <[email protected]>
+ * @copyright Copyright (c) 2018 Christoph Wurst <[email protected]>
  *
  * Two-factor U2F
  *

lib/Activity/Setting.php

@@ -1,8 +1,10 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * @author Christoph Wurst <[email protected]>
- * @copyright Copyright (c) 2016 Christoph Wurst <[email protected]>
+ * @copyright Copyright (c) 2018 Christoph Wurst <[email protected]>
  *
  * Two-factor U2F
  *

lib/Controller/SettingsController.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * Nextcloud - U2F 2FA
  *

lib/Db/Registration.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * Nextcloud - U2F 2FA
  *

lib/Db/RegistrationMapper.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * Nextcloud - U2F 2FA
  *

lib/Provider/U2FProvider.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * Nextcloud - U2F 2FA
  *

lib/Service/U2FManager.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * Nextcloud - U2F 2FA
  *

lib/Settings/Personal.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * @author Christoph Wurst <[email protected]>
  *

tests/Unit/Controller/SettingsControllerTest.php

@@ -14,6 +14,7 @@
 
 use OCA\TwoFactorU2F\Controller\SettingsController;
 use OCA\TwoFactorU2F\Service\U2FManager;
+use OCP\AppFramework\Http\JSONResponse;
 use OCP\IRequest;
 use OCP\IUser;
 use OCP\IUserSession;
@@ -64,10 +65,10 @@ public function testState() {
 			->with($this->equalTo($user))
 			->willReturn($devices);
 
-		$expected = [
+		$expected = new JSONResponse([
 			'devices' => $devices,
-		];
-		$this->assertSame($expected, $this->controller->state());
+		]);
+		$this->assertEquals($expected, $this->controller->state());
 	}
 
 	public function testStartRegister() {
@@ -81,7 +82,7 @@ public function testStartRegister() {
 			->with($this->equalTo($user))
 			->willReturn([]);
 
-		$this->assertEquals([], $this->controller->startRegister());
+		$this->assertEquals(new JSONResponse([]), $this->controller->startRegister());
 	}
 
 	public function testFinishRegister() {
@@ -94,9 +95,12 @@ public function testFinishRegister() {
 
 		$this->u2fManager->expects($this->once())
 			->method('finishRegistration')
-			->with($this->equalTo($user), $this->equalTo($registrationData), $this->equalTo($data));
+			->with($this->equalTo($user), $this->equalTo($registrationData), $this->equalTo($data))
+			->willReturn([]);
+
+		$resp = $this->controller->finishRegister($registrationData, $data);
 
-		$this->controller->finishRegister($registrationData, $data);
+		$this->assertEquals(new JSONResponse([]), $resp);
 	}
 
 }

tests/Unit/Service/U2FManagerTest.php

@@ -141,19 +141,4 @@ public function testStartRegistrationFirstDevice() {
 		$this->manager->startRegistration($user);
 	}
 
-	public function testFinishRegistration() {
-		// TODO: get a grasp of how the u2f lib works and feed it with
-		// realistic data or mock it.
-	}
-
-	public function testStartAuthenticate() {
-		// TODO: get a grasp of how the u2f lib works and feed it with
-		// realistic data or mock it.
-	}
-
-	public function testFinishAuthenticate() {
-		// TODO: get a grasp of how the u2f lib works and feed it with
-		// realistic data or mock it.
-	}
-
 }