chore: php parsing warnings (nullable parameter, http attributes)

Signed-off-by: Sebastien Marinier <sebastien.marinier@arawa.fr>
pull/417/head
Sebastien Marinier 2026-01-08 10:49:48 +01:00
parent b0b1fab64f
commit 0c1c8d25af
9 changed files with 49 additions and 33 deletions

View File

@ -68,7 +68,7 @@ class Provider implements IProvider {
$this->languageFactory = $languageFactory; $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) { if ($event->getApp() !== Application::ID) {
throw new \InvalidArgumentException(); throw new \InvalidArgumentException();
} }

View File

@ -107,7 +107,7 @@ class API {
* *
* @return float|int creation time * @return float|int creation time
*/ */
public function createMeeting(Room $room, Presentation $presentation = null) { public function createMeeting(Room $room, ?Presentation $presentation = null) {
$bbb = $this->getServer(); $bbb = $this->getServer();
$meetingParams = $this->buildMeetingParams($room, $presentation); $meetingParams = $this->buildMeetingParams($room, $presentation);
@ -128,7 +128,7 @@ class API {
return $response->getCreationTime(); 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 = new CreateMeetingParameters($room->uid, $room->name);
$createMeetingParams->setAttendeePW($room->attendeePassword); $createMeetingParams->setAttendeePW($room->attendeePassword);
$createMeetingParams->setModeratorPW($room->moderatorPassword); $createMeetingParams->setModeratorPW($room->moderatorPassword);

View File

@ -8,6 +8,8 @@ use OCA\BigBlueButton\Event\MeetingEndedEvent;
use OCA\BigBlueButton\Event\RecordingReadyEvent; use OCA\BigBlueButton\Event\RecordingReadyEvent;
use OCA\BigBlueButton\Service\RoomService; use OCA\BigBlueButton\Service\RoomService;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\EventDispatcher\IEventDispatcher; use OCP\EventDispatcher\IEventDispatcher;
use OCP\IRequest; use OCP\IRequest;
@ -53,12 +55,10 @@ class HookController extends Controller {
} }
/** /**
* @PublicPage
*
* @NoCSRFRequired
*
* @return void * @return void
*/ */
#[PublicPage]
#[NoCSRFRequired]
public function meetingEnded($recordingmarks = false): void { public function meetingEnded($recordingmarks = false): void {
$recordingmarks = \boolval($recordingmarks); $recordingmarks = \boolval($recordingmarks);
$room = $this->getRoom(); $room = $this->getRoom();
@ -71,12 +71,10 @@ class HookController extends Controller {
} }
/** /**
* @PublicPage
*
* @NoCSRFRequired
*
* @return void * @return void
*/ */
#[PublicPage]
#[NoCSRFRequired]
public function recordingReady(): void { public function recordingReady(): void {
$this->eventDispatcher->dispatchTyped(new RecordingReadyEvent($this->getRoom())); $this->eventDispatcher->dispatchTyped(new RecordingReadyEvent($this->getRoom()));
} }

View File

@ -11,6 +11,8 @@ use OCA\BigBlueButton\NotFoundException;
use OCA\BigBlueButton\Permission; use OCA\BigBlueButton\Permission;
use OCA\BigBlueButton\Service\RoomService; use OCA\BigBlueButton\Service\RoomService;
use OCP\AppFramework\Controller; 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\RedirectResponse;
use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Http\TemplateResponse;
use OCP\BackgroundJob\IJobList; use OCP\BackgroundJob\IJobList;
@ -75,12 +77,10 @@ class JoinController extends Controller {
} }
/** /**
* @PublicPage
*
* @NoCSRFRequired
*
* @return RedirectResponse|TemplateResponse * @return RedirectResponse|TemplateResponse
*/ */
#[PublicPage]
#[NoCSRFRequired]
public function index($displayname, $u = '', $filename = '', $password = '') { public function index($displayname, $u = '', $filename = '', $password = '') {
$room = $this->getRoom(); $room = $this->getRoom();

View File

@ -4,6 +4,8 @@ namespace OCA\BigBlueButton\Controller;
use OCA\BigBlueButton\TemplateProvider; use OCA\BigBlueButton\TemplateProvider;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Http\TemplateResponse;
use OCP\IRequest; use OCP\IRequest;
@ -18,12 +20,10 @@ class PageController extends Controller {
} }
/** /**
* @NoAdminRequired
*
* @NoCSRFRequired
*
* @return TemplateResponse * @return TemplateResponse
*/ */
#[NoAdminRequired]
#[NoCSRFRequired]
public function index(): TemplateResponse { public function index(): TemplateResponse {
return $this->templateProvider->getManager(); return $this->templateProvider->getManager();
} }

View File

@ -6,6 +6,7 @@ use OCA\BigBlueButton\Db\Restriction;
use OCA\BigBlueButton\Service\RestrictionService; use OCA\BigBlueButton\Service\RestrictionService;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\AppFramework\Http; use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\DataResponse;
use OCP\IGroupManager; use OCP\IGroupManager;
use OCP\IRequest; use OCP\IRequest;
@ -43,8 +44,9 @@ class RestrictionController extends Controller {
} }
/** /**
* @NoAdminRequired * @return DataResponse
*/ */
#[NoAdminRequired]
public function user(): DataResponse { public function user(): DataResponse {
$user = $this->userManager->get($this->userId); $user = $this->userManager->get($this->userId);
$groupIds = $this->groupManager->getUserGroupIds($user); $groupIds = $this->groupManager->getUserGroupIds($user);

View File

@ -8,6 +8,7 @@ use OCA\BigBlueButton\Permission;
use OCA\BigBlueButton\Service\RoomService; use OCA\BigBlueButton\Service\RoomService;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\AppFramework\Http; use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\DataResponse;
use OCP\IGroupManager; use OCP\IGroupManager;
use OCP\IRequest; use OCP\IRequest;
@ -54,8 +55,9 @@ class RoomController extends Controller {
} }
/** /**
* @NoAdminRequired * @return DataResponse
*/ */
#[NoAdminRequired]
public function index(): DataResponse { public function index(): DataResponse {
$user = $this->userManager->get($this->userId); $user = $this->userManager->get($this->userId);
$groupIds = $this->groupManager->getUserGroupIds($user); $groupIds = $this->groupManager->getUserGroupIds($user);
@ -65,8 +67,9 @@ class RoomController extends Controller {
} }
/** /**
* @NoAdminRequired * @return DataResponse
*/ */
#[NoAdminRequired]
public function create( public function create(
string $name, string $name,
string $welcome, string $welcome,
@ -104,8 +107,9 @@ class RoomController extends Controller {
} }
/** /**
* @NoAdminRequired * @return DataResponse
*/ */
#[NoAdminRequired]
public function update( public function update(
int $id, int $id,
string $name, string $name,
@ -148,8 +152,9 @@ class RoomController extends Controller {
} }
/** /**
* @NoAdminRequired * @return DataResponse
*/ */
#[NoAdminRequired]
public function destroy(int $id): DataResponse { public function destroy(int $id): DataResponse {
$room = $this->service->find($id); $room = $this->service->find($id);

View File

@ -9,6 +9,7 @@ use OCA\BigBlueButton\Service\RoomShareNotFound;
use OCA\BigBlueButton\Service\RoomShareService; use OCA\BigBlueButton\Service\RoomShareService;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\AppFramework\Http; use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\DataResponse;
use OCP\IGroupManager; use OCP\IGroupManager;
@ -56,8 +57,9 @@ class RoomShareController extends Controller {
} }
/** /**
* @NoAdminRequired * @return DataResponse
*/ */
#[NoAdminRequired]
public function index(): DataResponse { public function index(): DataResponse {
$roomId = $this->request->getParam('id'); $roomId = $this->request->getParam('id');
@ -113,8 +115,9 @@ class RoomShareController extends Controller {
} }
/** /**
* @NoAdminRequired * @return DataResponse
*/ */
#[NoAdminRequired]
public function create( public function create(
int $roomId, int $roomId,
int $shareType, int $shareType,
@ -134,8 +137,9 @@ class RoomShareController extends Controller {
} }
/** /**
* @NoAdminRequired * @return DataResponse
*/ */
#[NoAdminRequired]
public function update( public function update(
int $id, int $id,
int $roomId, int $roomId,
@ -164,8 +168,9 @@ class RoomShareController extends Controller {
} }
/** /**
* @NoAdminRequired * @return DataResponse
*/ */
#[NoAdminRequired]
public function destroy(int $id): DataResponse { public function destroy(int $id): DataResponse {
return $this->handleNotFound(function () use ($id) { return $this->handleNotFound(function () use ($id) {
$roomShare = $this->service->find($id); $roomShare = $this->service->find($id);

View File

@ -7,6 +7,7 @@ use OCA\BigBlueButton\Permission;
use OCA\BigBlueButton\Service\RoomService; use OCA\BigBlueButton\Service\RoomService;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\AppFramework\Http; use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\DataResponse;
use OCP\IRequest; use OCP\IRequest;
@ -41,8 +42,9 @@ class ServerController extends Controller {
} }
/** /**
* @NoAdminRequired * @return DataResponse
*/ */
#[NoAdminRequired]
public function isRunning(string $roomUid): DataResponse { public function isRunning(string $roomUid): DataResponse {
$room = $this->service->findByUid($roomUid); $room = $this->service->findByUid($roomUid);
@ -60,8 +62,9 @@ class ServerController extends Controller {
} }
/** /**
* @NoAdminRequired * @return DataResponse
*/ */
#[NoAdminRequired]
public function insertDocument(string $roomUid, string $url, string $filename): DataResponse { public function insertDocument(string $roomUid, string $url, string $filename): DataResponse {
$room = $this->service->findByUid($roomUid); $room = $this->service->findByUid($roomUid);
@ -79,8 +82,9 @@ class ServerController extends Controller {
} }
/** /**
* @NoAdminRequired * @return DataResponse
*/ */
#[NoAdminRequired]
public function records(string $roomUid): DataResponse { public function records(string $roomUid): DataResponse {
$room = $this->service->findByUid($roomUid); $room = $this->service->findByUid($roomUid);
@ -104,8 +108,9 @@ class ServerController extends Controller {
} }
/** /**
* @NoAdminRequired * @return DataResponse
*/ */
#[NoAdminRequired]
public function deleteRecord(string $recordId): DataResponse { public function deleteRecord(string $recordId): DataResponse {
$record = $this->server->getRecording($recordId); $record = $this->server->getRecording($recordId);
@ -125,8 +130,9 @@ class ServerController extends Controller {
} }
/** /**
* @NoAdminRequired * @return DataResponse
*/ */
#[NoAdminRequired]
public function publishRecord(string $recordId, bool $published): DataResponse { public function publishRecord(string $recordId, bool $published): DataResponse {
$record = $this->server->getRecording($recordId); $record = $this->server->getRecording($recordId);