Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions apps/user_ldap/lib/Controller/ConfigAPIController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -19,34 +16,19 @@
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);
}

/**
Expand Down
6 changes: 5 additions & 1 deletion core/Controller/OCSController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@
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,
Expand Down
12 changes: 2 additions & 10 deletions core/Controller/WhatsNewController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -17,27 +15,21 @@
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);
}

/**
Expand Down
4 changes: 4 additions & 0 deletions core/openapi-administration.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions core/openapi-ex_app.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions core/openapi-full.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions core/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading