From 098ab7af4b86e5aae74f5d2ed18d85e551f03952 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 16 Oct 2019 22:52:48 +0200 Subject: [PATCH 1/2] Do DI on registered middleware as well Signed-off-by: Roeland Jago Douma --- lib/private/AppFramework/DependencyInjection/DIContainer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index 7f416c3ed90..5f3fa1b6dc6 100644 --- a/lib/private/AppFramework/DependencyInjection/DIContainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php @@ -279,7 +279,7 @@ class DIContainer extends SimpleContainer implements IAppContainer { ); foreach($this->middleWares as $middleWare) { - $dispatcher->registerMiddleware($c[$middleWare]); + $dispatcher->registerMiddleware($c->query($middleWare)); } $dispatcher->registerMiddleware( From 4a2f9fab66b714c45ea430b33c88a65a8402b459 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 16 Oct 2019 22:53:09 +0200 Subject: [PATCH 2/2] Move over OCSShareAPIMIddleware to pure DI Signed-off-by: Roeland Jago Douma --- apps/files_sharing/lib/AppInfo/Application.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/apps/files_sharing/lib/AppInfo/Application.php b/apps/files_sharing/lib/AppInfo/Application.php index 195d56f3539..d1c5294dae9 100644 --- a/apps/files_sharing/lib/AppInfo/Application.php +++ b/apps/files_sharing/lib/AppInfo/Application.php @@ -127,13 +127,6 @@ class Application extends App { ); }); - $container->registerService('OCSShareAPIMiddleware', function (SimpleContainer $c) use ($server) { - return new OCSShareAPIMiddleware( - $server->getShareManager(), - $server->getL10N($c->query('AppName')) - ); - }); - $container->registerService(ShareInfoMiddleware::class, function () use ($server) { return new ShareInfoMiddleware( $server->getShareManager() @@ -142,7 +135,7 @@ class Application extends App { // Execute middlewares $container->registerMiddleWare('SharingCheckMiddleware'); - $container->registerMiddleWare('OCSShareAPIMiddleware'); + $container->registerMiddleWare(OCSShareAPIMiddleware::class); $container->registerMiddleWare(ShareInfoMiddleware::class); $container->registerService('MountProvider', function (IContainer $c) {