aboutsummaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2017-08-01 17:32:03 +0200
committerLukas Reschke <lukas@statuscode.ch>2017-08-01 17:32:03 +0200
commitf93a82b8b09109e391b0314f92d02d285c356ad6 (patch)
treec85246eadd2103200e26af6b208756dc87822e76 /settings
parent84c22fdeef6986f9038d8563937cc234751d5147 (diff)
downloadnextcloud-server-f93a82b8b09109e391b0314f92d02d285c356ad6.tar.gz
nextcloud-server-f93a82b8b09109e391b0314f92d02d285c356ad6.zip
Remove explicit type hints for Controller
This is public API and breaks the middlewares of existing apps. Since this also requires maintaining two different code paths for 12 and 13 I'm at the moment voting for reverting this change. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Diffstat (limited to 'settings')
-rw-r--r--settings/Middleware/SubadminMiddleware.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/settings/Middleware/SubadminMiddleware.php b/settings/Middleware/SubadminMiddleware.php
index 23f5ebac6b9..9914d65af02 100644
--- a/settings/Middleware/SubadminMiddleware.php
+++ b/settings/Middleware/SubadminMiddleware.php
@@ -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);