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

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

core/Controller/OCSController.php

@@ -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,

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

core/openapi-administration.json

@@ -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"

core/openapi-ex_app.json

@@ -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"

core/openapi-full.json

@@ -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"

core/openapi.json

@@ -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"

openapi.json

@@ -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"