diff --git a/apps/settings/lib/Controller/AdminSettingsController.php b/apps/settings/lib/Controller/AdminSettingsController.php index dfaa26ff695e2..2e5d2fce953b1 100644 --- a/apps/settings/lib/Controller/AdminSettingsController.php +++ b/apps/settings/lib/Controller/AdminSettingsController.php @@ -6,6 +6,7 @@ * @author Christoph Wurst * @author Lukas Reschke * @author Robin Appelman + * @author Kate Döen * * @license GNU AGPL version 3 or any later version * @@ -27,6 +28,7 @@ use OC\AppFramework\Middleware\Security\Exceptions\NotAdminException; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; use OCP\AppFramework\Http\TemplateResponse; use OCP\Group\ISubAdmin; use OCP\IGroupManager; @@ -37,6 +39,7 @@ use OCP\Settings\IManager as ISettingsManager; use OCP\Template; +#[IgnoreOpenAPI] class AdminSettingsController extends Controller { use CommonSettingsTrait; diff --git a/apps/settings/lib/Controller/AppSettingsController.php b/apps/settings/lib/Controller/AppSettingsController.php index bc84e17535ed8..403117a9e748f 100644 --- a/apps/settings/lib/Controller/AppSettingsController.php +++ b/apps/settings/lib/Controller/AppSettingsController.php @@ -13,6 +13,7 @@ * @author Morris Jobke * @author Roeland Jago Douma * @author Thomas Müller + * @author Kate Döen * * @license AGPL-3.0 * @@ -42,6 +43,7 @@ use OCP\App\IAppManager; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; +use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; use OCP\AppFramework\Http\ContentSecurityPolicy; use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\TemplateResponse; @@ -53,6 +55,7 @@ use OCP\L10N\IFactory; use Psr\Log\LoggerInterface; +#[IgnoreOpenAPI] class AppSettingsController extends Controller { /** @var \OCP\IL10N */ diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php index 59175be68843b..aae377d298541 100644 --- a/apps/settings/lib/Controller/CheckSetupController.php +++ b/apps/settings/lib/Controller/CheckSetupController.php @@ -26,6 +26,7 @@ * @author Timo Förster * @author Valdnet <47037905+Valdnet@users.noreply.github.com> * @author MichaIng + * @author Kate Döen * * @license AGPL-3.0 * @@ -69,6 +70,7 @@ use OCA\Settings\SetupChecks\SupportedDatabase; use OCP\App\IAppManager; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; use OCP\AppFramework\Http\DataDisplayResponse; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\RedirectResponse; @@ -89,6 +91,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; +#[IgnoreOpenAPI] class CheckSetupController extends Controller { /** @var IConfig */ private $config; diff --git a/apps/settings/lib/Controller/HelpController.php b/apps/settings/lib/Controller/HelpController.php index 38ce84843ed04..aa850b7d42e74 100644 --- a/apps/settings/lib/Controller/HelpController.php +++ b/apps/settings/lib/Controller/HelpController.php @@ -10,6 +10,7 @@ * @author Joas Schilling * @author Julius Härtl * @author Roeland Jago Douma + * @author Kate Döen * * @license GNU AGPL version 3 or any later version * @@ -30,6 +31,7 @@ namespace OCA\Settings\Controller; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; use OCP\AppFramework\Http\ContentSecurityPolicy; use OCP\AppFramework\Http\TemplateResponse; use OCP\IGroupManager; @@ -38,6 +40,7 @@ use OCP\IRequest; use OCP\IURLGenerator; +#[IgnoreOpenAPI] class HelpController extends Controller { /** @var INavigationManager */ diff --git a/apps/settings/lib/Controller/LogSettingsController.php b/apps/settings/lib/Controller/LogSettingsController.php index 08c18189d038e..4a28c3d17e4c9 100644 --- a/apps/settings/lib/Controller/LogSettingsController.php +++ b/apps/settings/lib/Controller/LogSettingsController.php @@ -8,6 +8,7 @@ * @author Lukas Reschke * @author Roeland Jago Douma * @author Thomas Müller + * @author Kate Döen * * @license AGPL-3.0 * @@ -28,6 +29,7 @@ use OC\Log; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http; use OCP\AppFramework\Http\StreamResponse; use OCP\IRequest; @@ -46,15 +48,19 @@ public function __construct(string $appName, IRequest $request, Log $logger) { * * @NoCSRFRequired * - * @return StreamResponse + * @psalm-suppress MoreSpecificReturnType The value of Content-Disposition is not relevant + * @psalm-suppress LessSpecificReturnStatement The value of Content-Disposition is not relevant + * @return StreamResponse */ public function download() { if (!$this->log instanceof Log) { throw new \UnexpectedValueException('Log file not available'); } $resp = new StreamResponse($this->log->getLogPath()); - $resp->addHeader('Content-Type', 'application/octet-stream'); - $resp->addHeader('Content-Disposition', 'attachment; filename="nextcloud.log"'); + $resp->setHeaders([ + 'Content-Type' => 'application/octet-stream', + 'Content-Disposition' => 'attachment; filename="nextcloud.log"', + ]); return $resp; } } diff --git a/apps/settings/lib/Controller/PersonalSettingsController.php b/apps/settings/lib/Controller/PersonalSettingsController.php index 8781ecd214e2c..09340117610c6 100644 --- a/apps/settings/lib/Controller/PersonalSettingsController.php +++ b/apps/settings/lib/Controller/PersonalSettingsController.php @@ -6,6 +6,7 @@ * @author Christoph Wurst * @author Joas Schilling * @author Robin Appelman + * @author Kate Döen * * @license GNU AGPL version 3 or any later version * @@ -26,6 +27,7 @@ namespace OCA\Settings\Controller; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; use OCP\AppFramework\Http\TemplateResponse; use OCP\Group\ISubAdmin; use OCP\IGroupManager; @@ -35,6 +37,7 @@ use OCP\Settings\IManager as ISettingsManager; use OCP\Template; +#[IgnoreOpenAPI] class PersonalSettingsController extends Controller { use CommonSettingsTrait; diff --git a/apps/settings/lib/Controller/ReasonsController.php b/apps/settings/lib/Controller/ReasonsController.php index 2ceb7005407ed..1ef61d7970fb5 100644 --- a/apps/settings/lib/Controller/ReasonsController.php +++ b/apps/settings/lib/Controller/ReasonsController.php @@ -6,6 +6,7 @@ * @copyright Copyright (c) 2020, Roeland Jago Douma * * @author Jan C. Borchardt + * @author Kate Döen * * @license GNU AGPL version 3 or any later version * @@ -26,8 +27,10 @@ namespace OCA\Settings\Controller; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; use OCP\AppFramework\Http\DataDisplayResponse; +#[IgnoreOpenAPI] class ReasonsController extends Controller { /** diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php index 89a850c19809a..41f1f614b81fb 100644 --- a/apps/settings/lib/Controller/UsersController.php +++ b/apps/settings/lib/Controller/UsersController.php @@ -16,6 +16,7 @@ * @author Morris Jobke * @author Roeland Jago Douma * @author Vincent Petry + * @author Kate Döen * * @license AGPL-3.0 * @@ -54,6 +55,7 @@ use OCP\Accounts\PropertyDoesNotExistException; use OCP\App\IAppManager; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\TemplateResponse; @@ -71,6 +73,7 @@ use OCP\Mail\IMailer; use function in_array; +#[IgnoreOpenAPI] class UsersController extends Controller { /** @var UserManager */ private $userManager; diff --git a/apps/settings/lib/Controller/WebAuthnController.php b/apps/settings/lib/Controller/WebAuthnController.php index 2692882301dc9..468685816f5b4 100644 --- a/apps/settings/lib/Controller/WebAuthnController.php +++ b/apps/settings/lib/Controller/WebAuthnController.php @@ -7,6 +7,7 @@ * * @author Joas Schilling * @author Roeland Jago Douma + * @author Kate Döen * * @license GNU AGPL version 3 or any later version * @@ -30,6 +31,7 @@ use OCA\Settings\AppInfo\Application; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; +use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; use OCP\AppFramework\Http\JSONResponse; use OCP\ILogger; use OCP\IRequest; @@ -37,6 +39,7 @@ use OCP\IUserSession; use Webauthn\PublicKeyCredentialCreationOptions; +#[IgnoreOpenAPI] class WebAuthnController extends Controller { private const WEBAUTHN_REGISTRATION = 'webauthn_registration'; diff --git a/apps/settings/openapi.json b/apps/settings/openapi.json index 6d1f8a1495044..6445d967dc2bf 100644 --- a/apps/settings/openapi.json +++ b/apps/settings/openapi.json @@ -19,7 +19,7 @@ "scheme": "bearer" } }, - "schemas": [] + "schemas": {} }, "paths": { "/index.php/settings/admin/log/download": {