diff options
author | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2014-04-10 20:24:30 +0200 |
---|---|---|
committer | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2014-04-10 20:24:30 +0200 |
commit | 2fc6fb36adfb8213b384fb23dc95d42087b1df40 (patch) | |
tree | d7907238dcb838d3f141dc487ac7c5f12f8243a4 /lib | |
parent | e401df26bcfabd5aeef5634cdf341145379defdb (diff) | |
parent | f06ef8aa4b02be0b43ab8cf2f83cf3a044ad9759 (diff) | |
download | nextcloud-server-2fc6fb36adfb8213b384fb23dc95d42087b1df40.tar.gz nextcloud-server-2fc6fb36adfb8213b384fb23dc95d42087b1df40.zip |
Merge pull request #8139 from owncloud/fix-middleware-registration
register middleware as string to not force request to be instantiated to...
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/appframework/dependencyinjection/dicontainer.php | 6 | ||||
-rw-r--r-- | lib/public/appframework/iappcontainer.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php index 4821ecaf67b..78224ea54c0 100644 --- a/lib/private/appframework/dependencyinjection/dicontainer.php +++ b/lib/private/appframework/dependencyinjection/dicontainer.php @@ -98,7 +98,7 @@ class DIContainer extends SimpleContainer implements IAppContainer{ $dispatcher->registerMiddleware($c['SecurityMiddleware']); foreach($middleWares as $middleWare) { - $dispatcher->registerMiddleware($middleWare); + $dispatcher->registerMiddleware($c[$middleWare]); } return $dispatcher; @@ -133,10 +133,10 @@ class DIContainer extends SimpleContainer implements IAppContainer{ } /** - * @param Middleware $middleWare + * @param string $middleWare * @return boolean|null */ - function registerMiddleWare(Middleware $middleWare) { + function registerMiddleWare($middleWare) { array_push($this->middleWares, $middleWare); } diff --git a/lib/public/appframework/iappcontainer.php b/lib/public/appframework/iappcontainer.php index e4f5f37cad2..a0b0c06881a 100644 --- a/lib/public/appframework/iappcontainer.php +++ b/lib/public/appframework/iappcontainer.php @@ -50,10 +50,10 @@ interface IAppContainer extends IContainer{ function getServer(); /** - * @param Middleware $middleWare + * @param string $middleWare * @return boolean */ - function registerMiddleWare(Middleware $middleWare); + function registerMiddleWare($middleWare); /** * @return boolean |