Rello · Rello · Sep 19, 2025 · Sep 19, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ### Changed
 - Time aggregation on all key figures and not only the last one
+- Replace controller HTTP annotations with PHP attributes
 
 ### Fixed
 - Hide menu bar and show loading spinner while reports are loading

diff --git a/lib/Controller/DataloadController.php b/lib/Controller/DataloadController.php
@@ -16,6 +16,7 @@
 use OCP\Files\NotFoundException;
 use OCP\IRequest;
 use Psr\Log\LoggerInterface;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 
 class DataloadController extends Controller
 {
@@ -37,12 +38,12 @@ public function __construct(
     /**
      * create a new dataload
      *
-     * @NoAdminRequired
      * @param $datasetId
      * @param int $datasourceId
      * @return DataResponse
      * @throws \OCP\DB\Exception
      */
+    #[NoAdminRequired]
     public function create($datasetId, int $datasourceId): DataResponse
     {
         return new DataResponse(['id' => $this->DataloadService->create($datasetId, $datasourceId)]);
@@ -51,11 +52,11 @@ public function create($datasetId, int $datasourceId): DataResponse
     /**
      * get all data loads for a dataset or report
      *
-     * @NoAdminRequired
      * @param $datasetId
      * @param $reportId
      * @return DataResponse
      */
+    #[NoAdminRequired]
     public function read($datasetId): DataResponse
     {
         return new DataResponse(['dataloads' => $this->DataloadService->read($datasetId)]);
@@ -64,13 +65,13 @@ public function read($datasetId): DataResponse
     /**
      * update dataload
      *
-     * @NoAdminRequired
      * @param int $dataloadId
      * @param $name
      * @param $option
      * @param $schedule
      * @return DataResponse
      */
+    #[NoAdminRequired]
     public function update(int $dataloadId, $name, $option, $schedule): DataResponse
     {
         return new DataResponse(['update' => $this->DataloadService->update($dataloadId, $name, $option, $schedule)]);
@@ -79,11 +80,11 @@ public function update(int $dataloadId, $name, $option, $schedule): DataResponse
     /**
      * copy a dataload
      *
-     * @NoAdminRequired
      * @param int $dataloadId
      * @return DataResponse
      * @throws NotFoundException
      */
+    #[NoAdminRequired]
     public function copy(int $dataloadId): DataResponse
     {
         return new DataResponse($this->DataloadService->copy($dataloadId));
@@ -92,10 +93,10 @@ public function copy(int $dataloadId): DataResponse
     /**
      * delete a dataload
      *
-     * @NoAdminRequired
      * @param int $dataloadId
      * @return bool
      */
+    #[NoAdminRequired]
     public function delete(int $dataloadId): bool
     {
         return $this->DataloadService->delete($dataloadId);
@@ -104,11 +105,11 @@ public function delete(int $dataloadId): bool
     /**
      * simulate a dataload and output its data
      *
-     * @NoAdminRequired
      * @param int $dataloadId
      * @return DataResponse
      * @throws NotFoundException
      */
+    #[NoAdminRequired]
     public function simulate(int $dataloadId): DataResponse
     {
         return new DataResponse($this->DataloadService->getDataFromDatasource($dataloadId));
@@ -117,11 +118,11 @@ public function simulate(int $dataloadId): DataResponse
     /**
      * execute a dataload from data source and store into dataset
      *
-     * @NoAdminRequired
      * @param int $dataloadId
      * @return DataResponse
      * @throws Exception
      */
+    #[NoAdminRequired]
     public function execute(int $dataloadId): DataResponse
     {
         return new DataResponse($this->DataloadService->execute($dataloadId));
@@ -135,7 +136,6 @@ public function execute(int $dataloadId): DataResponse
     /**
      * update data from input form
      *
-     * @NoAdminRequired
      * @param int $reportId
      * @param $dimension1
      * @param $dimension2
@@ -144,6 +144,7 @@ public function execute(int $dataloadId): DataResponse
      * @return DataResponse|NotFoundResponse
      * @throws Exception
      */
+    #[NoAdminRequired]
     public function updateData(int $reportId, $dimension1, $dimension2, $value, bool $isDataset)
     {
         $result = $this->DataloadService->updateData($reportId, $dimension1, $dimension2, $value, $isDataset);
@@ -157,13 +158,13 @@ public function updateData(int $reportId, $dimension1, $dimension2, $value, bool
     /**
      * delete data from input form
      *
-     * @NoAdminRequired
      * @param int $reportId
      * @param $dimension1
      * @param $dimension2
      * @param bool $isDataset
      * @return DataResponse|NotFoundResponse
      */
+    #[NoAdminRequired]
     public function deleteData(int $reportId, $dimension1, $dimension2, bool $isDataset)
     {
         $result = $this->DataloadService->deleteData($reportId, $dimension1, $dimension2, $isDataset);
@@ -177,13 +178,13 @@ public function deleteData(int $reportId, $dimension1, $dimension2, bool $isData
     /**
      * Simulate delete data from input form
      *
-     * @NoAdminRequired
      * @param int $reportId
      * @param $dimension1
      * @param $dimension2
      * @param bool $isDataset
      * @return DataResponse|NotFoundResponse
      */
+    #[NoAdminRequired]
     public function deleteDataSimulate(int $reportId, $dimension1, $dimension2, bool $isDataset)
     {
         $result = $this->DataloadService->deleteDataSimulate($reportId, $dimension1, $dimension2, $isDataset);
@@ -197,13 +198,13 @@ public function deleteDataSimulate(int $reportId, $dimension1, $dimension2, bool
     /**
      * Import clipboard data
      *
-     * @NoAdminRequired
      * @param int $reportId
      * @param $import
      * @param bool $isDataset
      * @return DataResponse|NotFoundResponse
      * @throws Exception
      */
+    #[NoAdminRequired]
     public function importClipboard(int $reportId, $import, bool $isDataset)
     {
         $result = $this->DataloadService->importClipboard($reportId, $import, $isDataset);
@@ -217,13 +218,13 @@ public function importClipboard(int $reportId, $import, bool $isDataset)
     /**
      * Import data into dataset from an internal or external file
      *
-     * @NoAdminRequired
      * @param int $reportId
      * @param $path
      * @param bool $isDataset
      * @return DataResponse|NotFoundResponse
      * @throws Exception
      */
+    #[NoAdminRequired]
     public function importFile(int $reportId, $path, bool $isDataset)
     {
         $result = $this->DataloadService->importFile($reportId, $path, $isDataset);

diff --git a/lib/Controller/DatasetController.php b/lib/Controller/DatasetController.php
@@ -15,6 +15,7 @@
 use OCP\DB\Exception;
 use OCP\IRequest;
 use Psr\Log\LoggerInterface;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 
 class DatasetController extends Controller {
 	private $logger;
@@ -37,47 +38,47 @@ public function __construct(
 	/**
 	 * get all datasets
 	 *
-	 * @NoAdminRequired
 	 * @return DataResponse
 	 */
+	#[NoAdminRequired]
 	public function index() {
 		return new DataResponse($this->DatasetService->index());
 	}
 
 	/**
 	 * create new dataset
 	 *
-	 * @NoAdminRequired
 	 * @param $name
 	 * @param $dimension1
 	 * @param $dimension2
 	 * @param $value
 	 * @return int
 	 * @throws \OCP\DB\Exception
 	 */
+	#[NoAdminRequired]
 	public function create($name, $dimension1, $dimension2, $value) {
 		return $this->DatasetService->create($name, $dimension1, $dimension2, $value);
 	}
 
 	/**
 	 * get own dataset details
 	 *
-	 * @NoAdminRequired
 	 * @param int $datasetId
 	 * @return array|bool
 	 */
+	#[NoAdminRequired]
 	public function read(int $datasetId) {
 		return $this->DatasetService->readOwn($datasetId);
 	}
 
 	/**
 	 * Delete Dataset and all depending objects
 	 *
-	 * @NoAdminRequired
 	 * @param int $datasetId
 	 * @return DataResponse
 	 * @throws \OCP\DB\Exception
 	 */
+	#[NoAdminRequired]
 	public function delete(int $datasetId) {
 		if ($this->DatasetService->isOwn($datasetId)) {
 			$reports = $this->ReportService->reportsForDataset($datasetId);
@@ -94,7 +95,6 @@ public function delete(int $datasetId) {
 	/**
 	 * get dataset details
 	 *
-	 * @NoAdminRequired
 	 * @param int $datasetId
 	 * @param $name
 	 * @param null $subheader
@@ -105,6 +105,7 @@ public function delete(int $datasetId) {
 	 * @return bool
 	 * @throws Exception
 	 */
+        #[NoAdminRequired]
         public function update(
                 int $datasetId,
                         $name,
@@ -120,56 +121,56 @@ public function update(
         /**
          * create dataset group
          *
-         * @NoAdminRequired
          * @param int $parent
          * @return int
          */
+        #[NoAdminRequired]
         public function createGroup(int $parent) {
                 return $this->DatasetService->createGroup($parent);
         }
 
         /**
          * update dataset group assignment
          *
-         * @NoAdminRequired
          * @param int $datasetId
          * @param int $groupId
          * @return bool
          */
+        #[NoAdminRequired]
         public function updateGroup(int $datasetId, int $groupId) {
                 return $this->DatasetService->updateGroup($datasetId, $groupId);
         }
 
         /**
          * rename dataset
          *
-         * @NoAdminRequired
          * @param int $datasetId
          * @param string $name
          * @return bool
          */
+        #[NoAdminRequired]
         public function rename(int $datasetId, string $name) {
                 return $this->DatasetService->rename($datasetId, $name);
         }
 
 	/**
 	 * get status of the dataset
 	 *
-	 * @NoAdminRequired
 	 * @param int $datasetId
 	 * @throws \OCP\DB\Exception
 	 */
+	#[NoAdminRequired]
 	public function status(int $datasetId) {
 		return $this->DatasetService->status($datasetId);
 	}
 
 	/**
 	 * Update the context chat provider
 	 *
-	 * @NoAdminRequired
 	 * @param int $datasetId
 	 * @return DataResponse
 	 */
+	#[NoAdminRequired]
 	public function provider(int $datasetId) {
 		if ($this->DatasetService->isOwn($datasetId)) {
 			$this->DatasetService->provider($datasetId);

diff --git a/lib/Controller/DatasourceController.php b/lib/Controller/DatasourceController.php
@@ -23,6 +23,7 @@
 use OCP\IRequest;
 use OCP\IAppConfig;
 use Psr\Log\LoggerInterface;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 
 class DatasourceController extends Controller {
 	private $logger;
@@ -81,10 +82,10 @@ public function __construct(
 	/**
 	 * get all data source ids + names
 	 *
-	 * @NoAdminRequired
 	 * @param int|null $datasourceType
 	 * @return array
 	 */
+	#[NoAdminRequired]
 	public function index(?int $datasourceType = null) {
 		$result = [];
 		$datasourceIndex = $this->getDatasources($datasourceType);
@@ -106,20 +107,20 @@ public function index(?int $datasourceType = null) {
 	/**
 	 * get one data source
 	 *
-	 * @NoAdminRequired
 	 * @param int|null $datasourceType
 	 * @return array
 	 */
+	#[NoAdminRequired]
 	public function indexFiltered(?int $datasourceType = null) {
 		return $this->index($datasourceType);
 	}
 
 	/**
 	 * get all data source templates
 	 *
-	 * @NoAdminRequired
 	 * @return array
 	 */
+	#[NoAdminRequired]
 	public function getTemplates() {
 		$result = array();
 		foreach ($this->getDatasources() as $key => $class) {
@@ -131,11 +132,11 @@ public function getTemplates() {
 	/**
      * Get the data from a data source;
 	 *
-	 * @NoAdminRequired
 	 * @param int $datasourceId
 	 * @param $datasetMetadata
 	 * @return array|NotFoundException
 	 */
+	#[NoAdminRequired]
 	public function read(int $datasourceId, $datasetMetadata) {
 		if (!$this->getDatasources()[$datasourceId]) {
 			$result['error'] = $this->l10n->t('Data source not available anymore');
@@ -267,11 +268,11 @@ private function getRegisteredDatasources(?int $datasourceType = null) {
 	/**
 	 * apply the fiven filters to the hole result set
 	 *
-	 * @NoAdminRequired
 	 * @param $data
 	 * @param $filter
 	 * @return array
 	 */
+	#[NoAdminRequired]
 	private function filterData($data, $filter) {
 		$options = json_decode($filter, true);
 		if (isset($options['filter'])) {