From 0c1c8d25aff1ebf2706030555f772cad38eedf60 Mon Sep 17 00:00:00 2001 From: Sebastien Marinier Date: Thu, 8 Jan 2026 10:49:48 +0100 Subject: [PATCH] chore: php parsing warnings (nullable parameter, http attributes) Signed-off-by: Sebastien Marinier --- lib/Activity/Provider.php | 2 +- lib/BigBlueButton/API.php | 4 ++-- lib/Controller/HookController.php | 14 ++++++-------- lib/Controller/JoinController.php | 8 ++++---- lib/Controller/PageController.php | 8 ++++---- lib/Controller/RestrictionController.php | 4 +++- lib/Controller/RoomController.php | 13 +++++++++---- lib/Controller/RoomShareController.php | 13 +++++++++---- lib/Controller/ServerController.php | 16 +++++++++++----- 9 files changed, 49 insertions(+), 33 deletions(-) diff --git a/lib/Activity/Provider.php b/lib/Activity/Provider.php index ad98e0b9..bec695db 100644 --- a/lib/Activity/Provider.php +++ b/lib/Activity/Provider.php @@ -68,7 +68,7 @@ public function __construct( $this->languageFactory = $languageFactory; } - public function parse($language, IEvent $event, IEvent $previousEvent = null) { + public function parse($language, IEvent $event, ?IEvent $previousEvent = null) { if ($event->getApp() !== Application::ID) { throw new \InvalidArgumentException(); } diff --git a/lib/BigBlueButton/API.php b/lib/BigBlueButton/API.php index 13c8f22f..08506c15 100644 --- a/lib/BigBlueButton/API.php +++ b/lib/BigBlueButton/API.php @@ -107,7 +107,7 @@ public function createJoinUrl(Room $room, float $creationTime, string $displayna * * @return float|int creation time */ - public function createMeeting(Room $room, Presentation $presentation = null) { + public function createMeeting(Room $room, ?Presentation $presentation = null) { $bbb = $this->getServer(); $meetingParams = $this->buildMeetingParams($room, $presentation); @@ -128,7 +128,7 @@ public function createMeeting(Room $room, Presentation $presentation = null) { return $response->getCreationTime(); } - private function buildMeetingParams(Room $room, Presentation $presentation = null): CreateMeetingParameters { + private function buildMeetingParams(Room $room, ?Presentation $presentation = null): CreateMeetingParameters { $createMeetingParams = new CreateMeetingParameters($room->uid, $room->name); $createMeetingParams->setAttendeePW($room->attendeePassword); $createMeetingParams->setModeratorPW($room->moderatorPassword); diff --git a/lib/Controller/HookController.php b/lib/Controller/HookController.php index f3c503a0..9ce66bf2 100644 --- a/lib/Controller/HookController.php +++ b/lib/Controller/HookController.php @@ -8,6 +8,8 @@ use OCA\BigBlueButton\Event\RecordingReadyEvent; use OCA\BigBlueButton\Service\RoomService; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\Attribute\NoCSRFRequired; +use OCP\AppFramework\Http\Attribute\PublicPage; use OCP\EventDispatcher\IEventDispatcher; use OCP\IRequest; @@ -53,12 +55,10 @@ public function isValidToken(): bool { } /** - * @PublicPage - * - * @NoCSRFRequired - * * @return void */ + #[PublicPage] + #[NoCSRFRequired] public function meetingEnded($recordingmarks = false): void { $recordingmarks = \boolval($recordingmarks); $room = $this->getRoom(); @@ -71,12 +71,10 @@ public function meetingEnded($recordingmarks = false): void { } /** - * @PublicPage - * - * @NoCSRFRequired - * * @return void */ + #[PublicPage] + #[NoCSRFRequired] public function recordingReady(): void { $this->eventDispatcher->dispatchTyped(new RecordingReadyEvent($this->getRoom())); } diff --git a/lib/Controller/JoinController.php b/lib/Controller/JoinController.php index 1a56a899..096f4629 100644 --- a/lib/Controller/JoinController.php +++ b/lib/Controller/JoinController.php @@ -11,6 +11,8 @@ use OCA\BigBlueButton\Permission; use OCA\BigBlueButton\Service\RoomService; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\Attribute\NoCSRFRequired; +use OCP\AppFramework\Http\Attribute\PublicPage; use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\TemplateResponse; use OCP\BackgroundJob\IJobList; @@ -75,12 +77,10 @@ public function isValidToken(): bool { } /** - * @PublicPage - * - * @NoCSRFRequired - * * @return RedirectResponse|TemplateResponse */ + #[PublicPage] + #[NoCSRFRequired] public function index($displayname, $u = '', $filename = '', $password = '') { $room = $this->getRoom(); diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index cc4bbb5d..e7f06b3f 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -4,6 +4,8 @@ use OCA\BigBlueButton\TemplateProvider; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\Attribute\NoAdminRequired; +use OCP\AppFramework\Http\Attribute\NoCSRFRequired; use OCP\AppFramework\Http\TemplateResponse; use OCP\IRequest; @@ -18,12 +20,10 @@ public function __construct(string $appName, IRequest $request, TemplateProvider } /** - * @NoAdminRequired - * - * @NoCSRFRequired - * * @return TemplateResponse */ + #[NoAdminRequired] + #[NoCSRFRequired] public function index(): TemplateResponse { return $this->templateProvider->getManager(); } diff --git a/lib/Controller/RestrictionController.php b/lib/Controller/RestrictionController.php index d5c25b3d..7173e77a 100644 --- a/lib/Controller/RestrictionController.php +++ b/lib/Controller/RestrictionController.php @@ -6,6 +6,7 @@ use OCA\BigBlueButton\Service\RestrictionService; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; +use OCP\AppFramework\Http\Attribute\NoAdminRequired; use OCP\AppFramework\Http\DataResponse; use OCP\IGroupManager; use OCP\IRequest; @@ -43,8 +44,9 @@ public function __construct( } /** - * @NoAdminRequired + * @return DataResponse */ + #[NoAdminRequired] public function user(): DataResponse { $user = $this->userManager->get($this->userId); $groupIds = $this->groupManager->getUserGroupIds($user); diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php index a5252c51..2113c99b 100644 --- a/lib/Controller/RoomController.php +++ b/lib/Controller/RoomController.php @@ -8,6 +8,7 @@ use OCA\BigBlueButton\Service\RoomService; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; +use OCP\AppFramework\Http\Attribute\NoAdminRequired; use OCP\AppFramework\Http\DataResponse; use OCP\IGroupManager; use OCP\IRequest; @@ -54,8 +55,9 @@ public function __construct( } /** - * @NoAdminRequired + * @return DataResponse */ + #[NoAdminRequired] public function index(): DataResponse { $user = $this->userManager->get($this->userId); $groupIds = $this->groupManager->getUserGroupIds($user); @@ -65,8 +67,9 @@ public function index(): DataResponse { } /** - * @NoAdminRequired + * @return DataResponse */ + #[NoAdminRequired] public function create( string $name, string $welcome, @@ -104,8 +107,9 @@ public function create( } /** - * @NoAdminRequired + * @return DataResponse */ + #[NoAdminRequired] public function update( int $id, string $name, @@ -148,8 +152,9 @@ public function update( } /** - * @NoAdminRequired + * @return DataResponse */ + #[NoAdminRequired] public function destroy(int $id): DataResponse { $room = $this->service->find($id); diff --git a/lib/Controller/RoomShareController.php b/lib/Controller/RoomShareController.php index b819f218..b6cb19d5 100644 --- a/lib/Controller/RoomShareController.php +++ b/lib/Controller/RoomShareController.php @@ -9,6 +9,7 @@ use OCA\BigBlueButton\Service\RoomShareService; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; +use OCP\AppFramework\Http\Attribute\NoAdminRequired; use OCP\AppFramework\Http\DataResponse; use OCP\IGroupManager; @@ -56,8 +57,9 @@ public function __construct( } /** - * @NoAdminRequired + * @return DataResponse */ + #[NoAdminRequired] public function index(): DataResponse { $roomId = $this->request->getParam('id'); @@ -113,8 +115,9 @@ public function index(): DataResponse { } /** - * @NoAdminRequired + * @return DataResponse */ + #[NoAdminRequired] public function create( int $roomId, int $shareType, @@ -134,8 +137,9 @@ public function create( } /** - * @NoAdminRequired + * @return DataResponse */ + #[NoAdminRequired] public function update( int $id, int $roomId, @@ -164,8 +168,9 @@ public function update( } /** - * @NoAdminRequired + * @return DataResponse */ + #[NoAdminRequired] public function destroy(int $id): DataResponse { return $this->handleNotFound(function () use ($id) { $roomShare = $this->service->find($id); diff --git a/lib/Controller/ServerController.php b/lib/Controller/ServerController.php index 476cd0f8..3987ae63 100644 --- a/lib/Controller/ServerController.php +++ b/lib/Controller/ServerController.php @@ -7,6 +7,7 @@ use OCA\BigBlueButton\Service\RoomService; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; +use OCP\AppFramework\Http\Attribute\NoAdminRequired; use OCP\AppFramework\Http\DataResponse; use OCP\IRequest; @@ -41,8 +42,9 @@ public function __construct( } /** - * @NoAdminRequired + * @return DataResponse */ + #[NoAdminRequired] public function isRunning(string $roomUid): DataResponse { $room = $this->service->findByUid($roomUid); @@ -60,8 +62,9 @@ public function isRunning(string $roomUid): DataResponse { } /** - * @NoAdminRequired + * @return DataResponse */ + #[NoAdminRequired] public function insertDocument(string $roomUid, string $url, string $filename): DataResponse { $room = $this->service->findByUid($roomUid); @@ -79,8 +82,9 @@ public function insertDocument(string $roomUid, string $url, string $filename): } /** - * @NoAdminRequired + * @return DataResponse */ + #[NoAdminRequired] public function records(string $roomUid): DataResponse { $room = $this->service->findByUid($roomUid); @@ -104,8 +108,9 @@ public function records(string $roomUid): DataResponse { } /** - * @NoAdminRequired + * @return DataResponse */ + #[NoAdminRequired] public function deleteRecord(string $recordId): DataResponse { $record = $this->server->getRecording($recordId); @@ -125,8 +130,9 @@ public function deleteRecord(string $recordId): DataResponse { } /** - * @NoAdminRequired + * @return DataResponse */ + #[NoAdminRequired] public function publishRecord(string $recordId, bool $published): DataResponse { $record = $this->server->getRecording($recordId);