From 13e98dce15b0b51fc16086840e677beed34988e1 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Tue, 30 Sep 2025 14:34:20 +0200 Subject: [PATCH] fix: Use the correct OCSController Signed-off-by: provokateurin --- .../lib/Controller/ConfigAPIController.php | 22 ++----------------- core/Controller/WhatsNewController.php | 12 ++-------- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/apps/user_ldap/lib/Controller/ConfigAPIController.php b/apps/user_ldap/lib/Controller/ConfigAPIController.php index d98e6d41b52..d78ee12f42b 100644 --- a/apps/user_ldap/lib/Controller/ConfigAPIController.php +++ b/apps/user_ldap/lib/Controller/ConfigAPIController.php @@ -6,9 +6,6 @@ */ namespace OCA\User_LDAP\Controller; -use OC\CapabilitiesManager; -use OC\Core\Controller\OCSController; -use OC\Security\IdentityProof\Manager; use OCA\User_LDAP\Configuration; use OCA\User_LDAP\ConnectionFactory; use OCA\User_LDAP\Helper; @@ -19,34 +16,19 @@ use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\OCS\OCSBadRequestException; use OCP\AppFramework\OCS\OCSException; use OCP\AppFramework\OCS\OCSNotFoundException; +use OCP\AppFramework\OCSController; use OCP\IRequest; -use OCP\IUserManager; -use OCP\IUserSession; -use OCP\ServerVersion; use Psr\Log\LoggerInterface; class ConfigAPIController extends OCSController { public function __construct( string $appName, IRequest $request, - CapabilitiesManager $capabilitiesManager, - IUserSession $userSession, - IUserManager $userManager, - Manager $keyManager, - ServerVersion $serverVersion, private Helper $ldapHelper, private LoggerInterface $logger, private ConnectionFactory $connectionFactory, ) { - parent::__construct( - $appName, - $request, - $capabilitiesManager, - $userSession, - $userManager, - $keyManager, - $serverVersion, - ); + parent::__construct($appName, $request); } /** diff --git a/core/Controller/WhatsNewController.php b/core/Controller/WhatsNewController.php index af8c3d4853b..7fa22b0faec 100644 --- a/core/Controller/WhatsNewController.php +++ b/core/Controller/WhatsNewController.php @@ -6,8 +6,6 @@ */ namespace OC\Core\Controller; -use OC\CapabilitiesManager; -use OC\Security\IdentityProof\Manager; use OC\Updater\ChangesCheck; use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Http; @@ -17,27 +15,21 @@ use OCP\AppFramework\Http\DataResponse; use OCP\Defaults; use OCP\IConfig; use OCP\IRequest; -use OCP\IUserManager; use OCP\IUserSession; use OCP\L10N\IFactory; use OCP\PreConditionNotMetException; -use OCP\ServerVersion; -class WhatsNewController extends OCSController { +class WhatsNewController extends \OCP\AppFramework\OCSController { public function __construct( string $appName, IRequest $request, - CapabilitiesManager $capabilitiesManager, private IUserSession $userSession, - IUserManager $userManager, - Manager $keyManager, - ServerVersion $serverVersion, private IConfig $config, private ChangesCheck $whatsNewService, private IFactory $langFactory, private Defaults $defaults, ) { - parent::__construct($appName, $request, $capabilitiesManager, $userSession, $userManager, $keyManager, $serverVersion); + parent::__construct($appName, $request); } /**