aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorprovokateurin <kate@provokateurin.de>2024-07-19 08:36:27 +0200
committerprovokateurin <kate@provokateurin.de>2024-07-19 08:59:53 +0200
commit908bafc5d5e0db60ae57f6bc2824652f88ffcbd1 (patch)
treec1cf01a86ce3daab3330cc9ee414a72546b9bac2
parent815fe7fb8be639096b12a3bc4989b261a6ac5d7b (diff)
downloadnextcloud-server-908bafc5d5e0db60ae57f6bc2824652f88ffcbd1.tar.gz
nextcloud-server-908bafc5d5e0db60ae57f6bc2824652f88ffcbd1.zip
fix(core,user_ldap): Extend correct OCSController
Signed-off-by: provokateurin <kate@provokateurin.de>
-rw-r--r--apps/user_ldap/lib/Controller/ConfigAPIController.php19
-rw-r--r--core/Controller/WhatsNewController.php9
2 files changed, 4 insertions, 24 deletions
diff --git a/apps/user_ldap/lib/Controller/ConfigAPIController.php b/apps/user_ldap/lib/Controller/ConfigAPIController.php
index a2f821dbbda..6dd8ff5f1f0 100644
--- a/apps/user_ldap/lib/Controller/ConfigAPIController.php
+++ b/apps/user_ldap/lib/Controller/ConfigAPIController.php
@@ -5,9 +5,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;
@@ -16,31 +13,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 Psr\Log\LoggerInterface;
class ConfigAPIController extends OCSController {
public function __construct(
string $appName,
IRequest $request,
- CapabilitiesManager $capabilitiesManager,
- IUserSession $userSession,
- IUserManager $userManager,
- Manager $keyManager,
private Helper $ldapHelper,
private LoggerInterface $logger,
private ConnectionFactory $connectionFactory
) {
- parent::__construct(
- $appName,
- $request,
- $capabilitiesManager,
- $userSession,
- $userManager,
- $keyManager
- );
+ parent::__construct($appName, $request);
}
/**
diff --git a/core/Controller/WhatsNewController.php b/core/Controller/WhatsNewController.php
index 1218e2d1f68..5fe509c18ef 100644
--- a/core/Controller/WhatsNewController.php
+++ b/core/Controller/WhatsNewController.php
@@ -5,17 +5,15 @@
*/
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;
use OCP\AppFramework\Http\Attribute\ApiRoute;
use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\OCSController;
use OCP\Defaults;
use OCP\IConfig;
use OCP\IRequest;
-use OCP\IUserManager;
use OCP\IUserSession;
use OCP\L10N\IFactory;
@@ -23,16 +21,13 @@ class WhatsNewController extends OCSController {
public function __construct(
string $appName,
IRequest $request,
- CapabilitiesManager $capabilitiesManager,
private IUserSession $userSession,
- IUserManager $userManager,
- Manager $keyManager,
private IConfig $config,
private ChangesCheck $whatsNewService,
private IFactory $langFactory,
private Defaults $defaults,
) {
- parent::__construct($appName, $request, $capabilitiesManager, $userSession, $userManager, $keyManager);
+ parent::__construct($appName, $request);
}
/**