From b9ac258870314a60ca5326d822ca404a19497e6c Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 7 Dec 2018 13:43:22 +0100
Subject: [PATCH] Strict controllers
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
.../lib/Controller/LoginRedirectorController.php | 5 +++--
.../oauth2/lib/Controller/OauthApiController.php | 16 +++-------------
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/apps/oauth2/lib/Controller/LoginRedirectorController.php b/apps/oauth2/lib/Controller/LoginRedirectorController.php
index 8e8cff1b1a5..25154cbd4dc 100644
--- a/apps/oauth2/lib/Controller/LoginRedirectorController.php
+++ b/apps/oauth2/lib/Controller/LoginRedirectorController.php
@@ -1,4 +1,5 @@
<?php
+declare(strict_types=1);
/**
* @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
*
@@ -50,7 +51,7 @@ class LoginRedirectorController extends Controller {
* @param ISession $session
* @param IL10N $l
*/
- public function __construct($appName,
+ public function __construct(string $appName,
IRequest $request,
IURLGenerator $urlGenerator,
ClientMapper $clientMapper,
@@ -75,7 +76,7 @@ class LoginRedirectorController extends Controller {
*/
public function authorize($client_id,
$state,
- $response_type) {
+ $response_type): Response {
try {
$client = $this->clientMapper->getByIdentifier($client_id);
} catch (ClientNotFoundException $e) {
diff --git a/apps/oauth2/lib/Controller/OauthApiController.php b/apps/oauth2/lib/Controller/OauthApiController.php
index 73fed3654d5..b05d3781e5c 100644
--- a/apps/oauth2/lib/Controller/OauthApiController.php
+++ b/apps/oauth2/lib/Controller/OauthApiController.php
@@ -1,4 +1,5 @@
<?php
+declare(strict_types=1);
/**
* @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
*
@@ -53,18 +54,7 @@ class OauthApiController extends Controller {
/** @var Throttler */
private $throttler;
- /**
- * @param string $appName
- * @param IRequest $request
- * @param ICrypto $crypto
- * @param AccessTokenMapper $accessTokenMapper
- * @param ClientMapper $clientMapper
- * @param TokenProvider $tokenProvider
- * @param ISecureRandom $secureRandom
- * @param ITimeFactory $time
- * @param Throttler $throttler
- */
- public function __construct($appName,
+ public function __construct(string $appName,
IRequest $request,
ICrypto $crypto,
AccessTokenMapper $accessTokenMapper,
@@ -94,7 +84,7 @@ class OauthApiController extends Controller {
* @param string $client_secret
* @return JSONResponse
*/
- public function getToken($grant_type, $code, $refresh_token, $client_id, $client_secret) {
+ public function getToken($grant_type, $code, $refresh_token, $client_id, $client_secret): JSONResponse {
// We only handle two types
if ($grant_type !== 'authorization_code' && $grant_type !== 'refresh_token') {
--
GitLab