Commit 3f0f18b4 authored by Morris Jobke's avatar Morris Jobke Committed by GitHub

Merge pull request #5948 from nextcloud/remove-explicit-declaration

Remove explicit type hints for Controller
parents 84c22fde f93a82b8
......@@ -59,7 +59,7 @@ class AddServerMiddleware extends Middleware {
* @return JSONResponse
* @throws \Exception
*/
public function afterException(Controller $controller, $methodName, \Exception $exception) {
public function afterException($controller, $methodName, \Exception $exception) {
if (($controller instanceof SettingsController) === false) {
throw $exception;
}
......
......@@ -28,7 +28,7 @@ class OCSShareAPIMiddleware extends Middleware {
*
* @throws OCSNotFoundException
*/
public function beforeController(Controller $controller, $methodName) {
public function beforeController($controller, $methodName) {
if ($controller instanceof ShareAPIController) {
if (!$this->shareManager->shareApiEnabled()) {
throw new OCSNotFoundException($this->l->t('Share API is disabled'));
......@@ -42,7 +42,7 @@ class OCSShareAPIMiddleware extends Middleware {
* @param Response $response
* @return Response
*/
public function afterController(Controller $controller, $methodName, Response $response) {
public function afterController($controller, $methodName, Response $response) {
if ($controller instanceof ShareAPIController) {
/** @var ShareAPIController $controller */
$controller->cleanup();
......
......@@ -92,7 +92,7 @@ class SharingCheckMiddleware extends Middleware {
* @throws S2SException
* @throws ShareNotFound
*/
public function beforeController(Controller $controller, $methodName) {
public function beforeController($controller, $methodName) {
if(!$this->isSharingEnabled()) {
throw new NotFoundException('Sharing is disabled.');
}
......@@ -119,7 +119,7 @@ class SharingCheckMiddleware extends Middleware {
* @return NotFoundResponse
* @throws \Exception
*/
public function afterException(Controller $controller, $methodName, \Exception $exception) {
public function afterException($controller, $methodName, \Exception $exception) {
if(is_a($exception, '\OCP\Files\NotFoundException')) {
return new NotFoundResponse();
}
......
......@@ -42,7 +42,7 @@ class ProvisioningApiMiddleware extends Middleware {
*
* @throws NotSubAdminException
*/
public function beforeController(Controller $controller, $methodName) {
public function beforeController($controller, $methodName) {
if (!$this->isAdmin && !$this->reflector->hasAnnotation('NoSubAdminRequired') && !$this->isSubAdmin) {
throw new NotSubAdminException();
}
......@@ -55,7 +55,7 @@ class ProvisioningApiMiddleware extends Middleware {
* @throws \Exception
* @return Response
*/
public function afterException(Controller $controller, $methodName, \Exception $exception) {
public function afterException($controller, $methodName, \Exception $exception) {
if ($exception instanceof NotSubAdminException) {
throw new OCSException($exception->getMessage(), \OCP\API::RESPOND_UNAUTHORISED);
}
......
......@@ -79,7 +79,7 @@ class TwoFactorMiddleware extends Middleware {
* @param Controller $controller
* @param string $methodName
*/
public function beforeController(Controller $controller, $methodName) {
public function beforeController($controller, $methodName) {
if ($this->reflector->hasAnnotation('PublicPage')) {
// Don't block public pages
return;
......@@ -122,7 +122,7 @@ class TwoFactorMiddleware extends Middleware {
}
}
public function afterException(Controller $controller, $methodName, Exception $exception) {
public function afterException($controller, $methodName, Exception $exception) {
if ($exception instanceof TwoFactorAuthRequiredException) {
$params = [];
if (isset($this->request->server['REQUEST_URI'])) {
......
......@@ -55,7 +55,7 @@ class OCSMiddleware extends Middleware {
* @param Controller $controller
* @param string $methodName
*/
public function beforeController(Controller $controller, $methodName) {
public function beforeController($controller, $methodName) {
if ($controller instanceof OCSController) {
if (substr_compare($this->request->getScriptName(), '/ocs/v2.php', -strlen('/ocs/v2.php')) === 0) {
$this->ocsVersion = 2;
......@@ -73,7 +73,7 @@ class OCSMiddleware extends Middleware {
* @throws \Exception
* @return BaseResponse
*/
public function afterException(Controller $controller, $methodName, \Exception $exception) {
public function afterException($controller, $methodName, \Exception $exception) {
if ($controller instanceof OCSController && $exception instanceof OCSException) {
$code = $exception->getCode();
if ($code === 0) {
......@@ -92,7 +92,7 @@ class OCSMiddleware extends Middleware {
* @param Response $response
* @return \OCP\AppFramework\Http\Response
*/
public function afterController(Controller $controller, $methodName, Response $response) {
public function afterController($controller, $methodName, Response $response) {
/*
* If a different middleware has detected that a request unauthorized or forbidden
* we need to catch the response and convert it to a proper OCS response.
......
......@@ -59,7 +59,7 @@ class BruteForceMiddleware extends Middleware {
/**
* {@inheritDoc}
*/
public function beforeController(Controller $controller, $methodName) {
public function beforeController($controller, $methodName) {
parent::beforeController($controller, $methodName);
if($this->reflector->hasAnnotation('BruteForceProtection')) {
......@@ -71,7 +71,7 @@ class BruteForceMiddleware extends Middleware {
/**
* {@inheritDoc}
*/
public function afterController(Controller $controller, $methodName, Response $response) {
public function afterController($controller, $methodName, Response $response) {
if($this->reflector->hasAnnotation('BruteForceProtection') && $response->isThrottled()) {
$action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
$ip = $this->request->getRemoteAddress();
......
......@@ -80,7 +80,7 @@ class CORSMiddleware extends Middleware {
* @throws SecurityException
* @since 6.0.0
*/
public function beforeController(Controller $controller, $methodName){
public function beforeController($controller, $methodName){
// ensure that @CORS annotated API routes are not used in conjunction
// with session authentication since this enables CSRF attack vectors
if ($this->reflector->hasAnnotation('CORS') &&
......@@ -110,7 +110,7 @@ class CORSMiddleware extends Middleware {
* @return Response a Response object
* @throws SecurityException
*/
public function afterController(Controller $controller, $methodName, Response $response){
public function afterController($controller, $methodName, Response $response){
// only react if its a CORS request and if the request sends origin and
if(isset($this->request->server['HTTP_ORIGIN']) &&
......@@ -143,7 +143,7 @@ class CORSMiddleware extends Middleware {
* @throws \Exception the passed in exception if it can't handle it
* @return Response a Response object or null in case that the exception could not be handled
*/
public function afterException(Controller $controller, $methodName, \Exception $exception){
public function afterException($controller, $methodName, \Exception $exception){
if($exception instanceof SecurityException){
$response = new JSONResponse(['message' => $exception->getMessage()]);
if($exception->getCode() !== 0) {
......
......@@ -77,7 +77,7 @@ class RateLimitingMiddleware extends Middleware {
* {@inheritDoc}
* @throws RateLimitExceededException
*/
public function beforeController(Controller $controller, $methodName) {
public function beforeController($controller, $methodName) {
parent::beforeController($controller, $methodName);
$anonLimit = $this->reflector->getAnnotationParameter('AnonRateThrottle', 'limit');
......@@ -105,7 +105,7 @@ class RateLimitingMiddleware extends Middleware {
/**
* {@inheritDoc}
*/
public function afterException(Controller $controller, $methodName, \Exception $exception) {
public function afterException($controller, $methodName, \Exception $exception) {
if($exception instanceof RateLimitExceededException) {
if (stripos($this->request->getHeader('Accept'),'html') === false) {
$response = new JSONResponse(
......
......@@ -136,7 +136,7 @@ class SecurityMiddleware extends Middleware {
* @param string $methodName the name of the method
* @throws SecurityException when a security check fails
*/
public function beforeController(Controller $controller, $methodName) {
public function beforeController($controller, $methodName) {
// this will set the current navigation entry of the app, use this only
// for normal HTML requests and not for AJAX requests
......@@ -205,7 +205,7 @@ class SecurityMiddleware extends Middleware {
* @param Response $response
* @return Response
*/
public function afterController(Controller $controller, $methodName, Response $response) {
public function afterController($controller, $methodName, Response $response) {
$policy = !is_null($response->getContentSecurityPolicy()) ? $response->getContentSecurityPolicy() : new ContentSecurityPolicy();
if (get_class($policy) === EmptyContentSecurityPolicy::class) {
......@@ -234,7 +234,7 @@ class SecurityMiddleware extends Middleware {
* @throws \Exception the passed in exception if it can't handle it
* @return Response a Response object or null in case that the exception could not be handled
*/
public function afterException(Controller $controller, $methodName, \Exception $exception) {
public function afterException($controller, $methodName, \Exception $exception) {
if($exception instanceof SecurityException) {
if($exception instanceof StrictCookieMissingException) {
return new RedirectResponse(\OC::$WEBROOT);
......
......@@ -59,7 +59,7 @@ class SessionMiddleware extends Middleware {
* @param Controller $controller
* @param string $methodName
*/
public function beforeController(Controller $controller, $methodName) {
public function beforeController($controller, $methodName) {
$useSession = $this->reflector->hasAnnotation('UseSession');
if (!$useSession) {
$this->session->close();
......@@ -72,7 +72,7 @@ class SessionMiddleware extends Middleware {
* @param Response $response
* @return Response
*/
public function afterController(Controller $controller, $methodName, Response $response){
public function afterController($controller, $methodName, Response $response){
$useSession = $this->reflector->hasAnnotation('UseSession');
if ($useSession) {
$this->session->close();
......
......@@ -52,7 +52,7 @@ abstract class Middleware {
* the controller
* @since 6.0.0
*/
public function beforeController(Controller $controller, $methodName){
public function beforeController($controller, $methodName){
}
......@@ -72,7 +72,7 @@ abstract class Middleware {
* @return Response a Response object in case that the exception was handled
* @since 6.0.0
*/
public function afterException(Controller $controller, $methodName, \Exception $exception){
public function afterException($controller, $methodName, \Exception $exception){
throw $exception;
}
......@@ -88,7 +88,7 @@ abstract class Middleware {
* @return Response a Response object
* @since 6.0.0
*/
public function afterController(Controller $controller, $methodName, Response $response){
public function afterController($controller, $methodName, Response $response){
return $response;
}
......@@ -104,7 +104,7 @@ abstract class Middleware {
* @return string the output that should be printed
* @since 6.0.0
*/
public function beforeOutput(Controller $controller, $methodName, $output){
public function beforeOutput($controller, $methodName, $output){
return $output;
}
......
......@@ -59,7 +59,7 @@ class SubadminMiddleware extends Middleware {
* @param string $methodName
* @throws \Exception
*/
public function beforeController(Controller $controller, $methodName) {
public function beforeController($controller, $methodName) {
if(!$this->reflector->hasAnnotation('NoSubadminRequired')) {
if(!$this->isSubAdmin) {
throw new NotAdminException('Logged in user must be a subadmin');
......@@ -75,7 +75,7 @@ class SubadminMiddleware extends Middleware {
* @return TemplateResponse
* @throws \Exception
*/
public function afterException(Controller $controller, $methodName, \Exception $exception) {
public function afterException($controller, $methodName, \Exception $exception) {
if($exception instanceof NotAdminException) {
$response = new TemplateResponse('core', '403', array(), 'guest');
$response->setStatus(Http::STATUS_FORBIDDEN);
......
......@@ -62,7 +62,7 @@ class TestMiddleware extends Middleware {
$this->beforeControllerThrowsEx = $beforeControllerThrowsEx;
}
public function beforeController(Controller $controller, $methodName){
public function beforeController($controller, $methodName){
self::$beforeControllerCalled++;
$this->beforeControllerOrder = self::$beforeControllerCalled;
$this->controller = $controller;
......@@ -72,7 +72,7 @@ class TestMiddleware extends Middleware {
}
}
public function afterException(Controller $controller, $methodName, \Exception $exception){
public function afterException($controller, $methodName, \Exception $exception){
self::$afterExceptionCalled++;
$this->afterExceptionOrder = self::$afterExceptionCalled;
$this->controller = $controller;
......@@ -81,7 +81,7 @@ class TestMiddleware extends Middleware {
parent::afterException($controller, $methodName, $exception);
}
public function afterController(Controller $controller, $methodName, Response $response){
public function afterController($controller, $methodName, Response $response){
self::$afterControllerCalled++;
$this->afterControllerOrder = self::$afterControllerCalled;
$this->controller = $controller;
......@@ -90,7 +90,7 @@ class TestMiddleware extends Middleware {
return parent::afterController($controller, $methodName, $response);
}
public function beforeOutput(Controller $controller, $methodName, $output){
public function beforeOutput($controller, $methodName, $output){
self::$beforeOutputCalled++;
$this->beforeOutputOrder = self::$beforeOutputCalled;
$this->controller = $controller;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment