upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-03 20:41:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 37

Merge pull request #55431 from nextcloud/fix/ocscontroller-usage

Browse source
This commit is contained in:
Kate 2025-10-01 10:43:21 +02:00 committed by GitHub
commit 52aed034b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 29 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/user_ldap/lib/Controller/ConfigAPIController.php
View file

@ -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;
@ -20,34 +17,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);
}
/**

6
core/Controller/OCSController.php
View file

@ -20,7 +20,11 @@ use OCP\IUserSession;
use OCP\ServerVersion;
use OCP\Util;
class OCSController extends \OCP\AppFramework\OCSController {
/**
* If you are here because you can't extend the OCSController class, you got the wrong one.
* Please use {@see \OCP\AppFramework\OCSController}!
*/
final class OCSController extends \OCP\AppFramework\OCSController {
public function __construct(
string $appName,
IRequest $request,

12
core/Controller/WhatsNewController.php
View file

@ -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);
}
/**

4
core/openapi-administration.json
View file

@ -644,6 +644,10 @@
}
},
"tags": [
{
"name": "ocs",
"description": "If you are here because you can't extend the OCSController class, you got the wrong one. Please use {@see \\OCP\\AppFramework\\OCSController}!"
},
{
"name": "avatar",
"description": "Class AvatarController"

4
core/openapi-ex_app.json
View file

@ -1367,6 +1367,10 @@
}
},
"tags": [
{
"name": "ocs",
"description": "If you are here because you can't extend the OCSController class, you got the wrong one. Please use {@see \\OCP\\AppFramework\\OCSController}!"
},
{
"name": "avatar",
"description": "Class AvatarController"

4
core/openapi-full.json
View file

@ -11788,6 +11788,10 @@
}
},
"tags": [
{
"name": "ocs",
"description": "If you are here because you can't extend the OCSController class, you got the wrong one. Please use {@see \\OCP\\AppFramework\\OCSController}!"
},
{
"name": "avatar",
"description": "Class AvatarController"

4
core/openapi.json
View file

@ -10152,6 +10152,10 @@
}
},
"tags": [
{
"name": "ocs",
"description": "If you are here because you can't extend the OCSController class, you got the wrong one. Please use {@see \\OCP\\AppFramework\\OCSController}!"
},
{
"name": "avatar",
"description": "Class AvatarController"

4
openapi.json
View file

@ -17,6 +17,10 @@
}
],
"tags": [
{
"name": "core/ocs",
"description": "If you are here because you can't extend the OCSController class, you got the wrong one. Please use {@see \\OCP\\AppFramework\\OCSController}!"
},
{
"name": "core/avatar",
"description": "Class AvatarController"