1 files changed, 18 insertions, 28 deletions
diff --git a/apps/dav/lib/Controller/InvitationResponseController.php b/apps/dav/lib/Controller/InvitationResponseController.php
index 4144e58d2cc..19eb4097b45 100644
--- a/apps/dav/lib/Controller/InvitationResponseController.php
+++ b/apps/dav/lib/Controller/InvitationResponseController.php
@@ -10,7 +10,9 @@ namespace OCA\DAV\Controller;
 
 use OCA\DAV\CalDAV\InvitationResponse\InvitationResponseServer;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\Attribute\OpenAPI;
+use OCP\AppFramework\Http\Attribute\PublicPage;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IDBConnection;
@@ -21,15 +23,6 @@ use Sabre\VObject\Reader;
 #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
 class InvitationResponseController extends Controller {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var InvitationResponseServer */
-	private $responseServer;
-
 	/**
 	 * InvitationResponseController constructor.
 	 *
@@ -39,25 +32,25 @@ class InvitationResponseController extends Controller {
 	 * @param ITimeFactory $timeFactory
 	 * @param InvitationResponseServer $responseServer
 	 */
-	public function __construct(string $appName, IRequest $request,
-		IDBConnection $db, ITimeFactory $timeFactory,
-		InvitationResponseServer $responseServer) {
+	public function __construct(
+		string $appName,
+		IRequest $request,
+		private IDBConnection $db,
+		private ITimeFactory $timeFactory,
+		private InvitationResponseServer $responseServer,
+	) {
 		parent::__construct($appName, $request);
-		$this->db = $db;
-		$this->timeFactory = $timeFactory;
-		$this->responseServer = $responseServer;
 		// Don't run `$server->exec()`, because we just need access to the
 		// fully initialized schedule plugin, but we don't want Sabre/DAV
 		// to actually handle and reply to the request
 	}
 
 	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
 	 * @param string $token
 	 * @return TemplateResponse
 	 */
+	#[PublicPage]
+	#[NoCSRFRequired]
 	public function accept(string $token):TemplateResponse {
 		$row = $this->getTokenInformation($token);
 		if (!$row) {
@@ -76,12 +69,11 @@ class InvitationResponseController extends Controller {
 	}
 
 	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
 	 * @param string $token
 	 * @return TemplateResponse
 	 */
+	#[PublicPage]
+	#[NoCSRFRequired]
 	public function decline(string $token):TemplateResponse {
 		$row = $this->getTokenInformation($token);
 		if (!$row) {
@@ -101,12 +93,11 @@ class InvitationResponseController extends Controller {
 	}
 
 	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
 	 * @param string $token
 	 * @return TemplateResponse
 	 */
+	#[PublicPage]
+	#[NoCSRFRequired]
 	public function options(string $token):TemplateResponse {
 		return new TemplateResponse($this->appName, 'schedule-response-options', [
 			'token' => $token
@@ -114,13 +105,12 @@ class InvitationResponseController extends Controller {
 	}
 
 	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
 	 * @param string $token
 	 *
 	 * @return TemplateResponse
 	 */
+	#[PublicPage]
+	#[NoCSRFRequired]
 	public function processMoreOptionsResult(string $token):TemplateResponse {
 		$partstat = $this->request->getParam('partStat');
 
@@ -158,7 +148,7 @@ class InvitationResponseController extends Controller {
 		}
 
 		$currentTime = $this->timeFactory->getTime();
-		if (((int) $row['expiration']) < $currentTime) {
+		if (((int)$row['expiration']) < $currentTime) {
 			return null;
 		}