refactor(php): Using native PHP8.0 attributes

appinfo/info.xml

@@ -20,6 +20,7 @@
 
     <bugs>https://www.arawa.fr/contact/</bugs>
     <dependencies>
+        <php min-version="8.0"/>
         <nextcloud min-version="25" max-version="29"/>
     </dependencies>
 

lib/AppInfo/Application.php

@@ -31,7 +31,6 @@
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
-use OCP\AppFramework\Utility\IControllerMethodReflector;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 
@@ -52,7 +51,6 @@ public function register(IRegistrationContext $context): void {
 
 		$context->registerService(IsSpaceAdminMiddleware::class, function ($c) {
 			return new IsSpaceAdminMiddleware(
-				$c->query(IControllerMethodReflector::class),
 				$c->query(IRequest::class),
 				$c->query(UserService::class),
 				$c->query(SpaceService::class)
@@ -61,8 +59,6 @@ public function register(IRegistrationContext $context): void {
 
 		$context->registerService(IsGeneralManagerMiddleware::class, function ($c) {
 			return new IsGeneralManagerMiddleware(
-				$c->query(IControllerMethodReflector::class),
-				$c->query(IRequest::class),
 				$c->query(UserService::class)
 			);
 		});

lib/Controller/FileCSVController.php

@@ -28,10 +28,12 @@
 use OCA\Workspace\Files\Csv;
 use OCA\Workspace\Files\InternalFile;
 use OCA\Workspace\Files\LocalFile;
+use OCA\Workspace\Middleware\Attribute\SpaceAdminRequired;
 use OCA\Workspace\Service\UserService;
 use OCA\Workspace\Service\WorkspaceService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;
@@ -57,11 +59,10 @@ public function __construct(
 	}
 
 	/**
-	 * @NoAdminRequired
-	 * @SpaceAdminRequired
 	 * Returns formatted list of existing users of the instance.
-	 *
 	 */
+	#[NoAdminRequired]
+	#[SpaceAdminRequired]
 	public function import(): JSONResponse {
 		$params = $this->request->getParams();
 		$spaceObj = $params['space'];
@@ -116,11 +117,10 @@ public function import(): JSONResponse {
 	}
 
 	/**
-	 * @NoAdminRequired
-	 * @SpaceAdminRequired
 	 * Returns formatted list of existing users of the instance.
-	 *
 	 */
+	#[NoAdminRequired]
+	#[SpaceAdminRequired]
 	public function getFromFiles():JSONResponse {
 		$params = $this->request->getParams();
 		$path = $params['path'];

lib/Controller/GroupController.php

@@ -25,6 +25,8 @@
 
 namespace OCA\Workspace\Controller;
 
+use OCA\Workspace\Middleware\Attribute\GeneralManagerRequired;
+use OCA\Workspace\Middleware\Attribute\SpaceAdminRequired;
 use OCA\Workspace\Service\Group\GroupFolder\GroupFolderManage;
 use OCA\Workspace\Service\Group\GroupFormatter;
 use OCA\Workspace\Service\Group\GroupsWorkspaceService;
@@ -36,6 +38,7 @@
 use OCA\Workspace\Service\UserService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IGroupManager;
 use OCP\IRequest;
@@ -60,9 +63,6 @@ public function __construct(
 	}
 
 	/**
-	 * @NoAdminRequired
-	 * @SpaceAdminRequired
-	 *
 	 * Creates a group
 	 * NB: This function could probably be abused by space managers to create arbitrary group. But, do we really care?
 	 *
@@ -73,6 +73,8 @@ public function __construct(
 	 * @var string $spaceId for Middleware
 	 *
 	 */
+	#[NoAdminRequired]
+	#[SpaceAdminRequired]
 	public function create(array $data = []): JSONResponse {
 
 		$data = array_merge(self::DEFAULT, $data);
@@ -100,16 +102,15 @@ public function create(array $data = []): JSONResponse {
 	}
 
 	/**
-	 * @NoAdminRequired
-	 * @SpaceAdminRequired
-	 *
 	 * Deletes a group
 	 * Cannot delete GE- and U- groups (This is on-purpose)
 	 *
 	 * @var string $gid
 	 * @var int $spaceId
 	 *
 	 */
+	#[NoAdminRequired]
+	#[SpaceAdminRequired]
 	public function delete(string $gid, int $spaceId): JSONResponse {
 		// TODO Use groupfolder api to retrieve workspace group.
 		if (substr($gid, -strlen($spaceId)) != $spaceId) {
@@ -132,9 +133,6 @@ public function delete(string $gid, int $spaceId): JSONResponse {
 	}
 
 	/**
-	 * @NoAdminRequired
-	 * @SpaceAdminRequired
-	 *
 	 * Renames a group
 	 * Cannot rename GE- and U- groups (This is on-purpose)
 	 *
@@ -143,6 +141,8 @@ public function delete(string $gid, int $spaceId): JSONResponse {
 	 * @var int $spaceId
 	 *
 	 */
+	#[NoAdminRequired]
+	#[SpaceAdminRequired]
 	public function rename(string $newGroupName,
 		string $gid,
 		int $spaceId): JSONResponse {
@@ -176,8 +176,6 @@ public function rename(string $newGroupName,
 	}
 
 	/**
-	 * @NoAdminRequired
-	 * @SpaceAdminRequired
 	 * Adds a user to a group.
 	 * The function automaticaly adds the user the the corresponding workspace's user group, and to the application
 	 * manager group when we are adding a workspace manager
@@ -187,6 +185,8 @@ public function rename(string $newGroupName,
 	 * @var string $user
 	 *
 	 */
+	#[NoAdminRequired]
+	#[SpaceAdminRequired]
 	public function addUser(string $spaceId, string $gid, string $user): JSONResponse {
 		// Makes sure group exist
 		$NCGroup = $this->groupManager->get($gid);
@@ -226,14 +226,13 @@ public function addUser(string $spaceId, string $gid, string $user): JSONRespons
 	/**
 	 * Remove a user from a workspace.
 	 *
-	 * @NoAdminRequired
-	 * @SpaceAdminRequired
-	 *
 	 * @param array|string $space
 	 * @param string $gid
 	 * @param string $user
 	 * @return JSONResponse
 	 */
+	#[NoAdminRequired]
+	#[SpaceAdminRequired]
 	public function removeUserFromWorkspace(
 		array|string $space,
 		string $gid,
@@ -283,9 +282,6 @@ public function removeUserFromWorkspace(
 	}
 
 	/**
-	 * @NoAdminRequired
-	 * @SpaceAdminRequired
-	 *
 	 * Removes a user from a group
 	 * The function also remove the user from all workspace 'subgroup when the user is being removed from the U- group
 	 * and from the WorkspacesManagers group when the user is being removed from the GE- group
@@ -295,6 +291,8 @@ public function removeUserFromWorkspace(
 	 * @var string $user
 	 *
 	 */
+	#[NoAdminRequired]
+	#[SpaceAdminRequired]
 	public function removeUser(
 		IRequest $request,
 		array|string $space,
@@ -370,11 +368,11 @@ public function removeUser(
 	}
 
 	/**
-	 * @NoAdminRequired
-	 * @GeneralManagerRequired
+	 * @param string $spaceId
 	 * @param string|array $groupfolder
-	 *
 	 */
+	#[NoAdminRequired]
+	#[GeneralManagerRequired]
 	public function transferUsersToGroups(string $spaceId,
 		string|array $groupfolder): JSONResponse {
 		if (gettype($groupfolder) === 'string') {

lib/Controller/PageController.php

@@ -28,6 +28,8 @@
 use OCA\Workspace\AppInfo\Application;
 use OCA\Workspace\Service\UserService;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\Util;
 
@@ -40,9 +42,9 @@ public function __construct(
 	/**
 	 * Application's main page
 	 *
-	 * @NoAdminRequired
-	 * @NOCSRFRequired
 	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
 	public function index(): TemplateResponse {
 		Util::addScript(Application::APP_ID, 'workspace-main');		// js/workspace-main.js
 		Util::addStyle(Application::APP_ID, 'workspace-style');		// css/workspace-style.css

lib/Controller/SpaceController.php

@@ -26,8 +26,10 @@
 namespace OCA\Workspace\Controller;
 
 use OCA\Workspace\Db\SpaceMapper;
+use OCA\Workspace\Middleware\Attribute\SpaceAdminRequired;
 use OCA\Workspace\Service\SpaceService;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IRequest;
 
@@ -42,23 +44,24 @@ public function __construct(
 	}
 
 	/**
-	 * @NoAdminRequired
+	 * @param $id - The space id to get a space - OCA\Workspace\Db\Space .
+	 * @return DataResponse - The space serialized
 	 */
+	#[NoAdminRequired]
 	public function find(int $id): DataResponse {
 		return new DataResponse($this->spaceService->find($id));
 	}
 
-	/**
-	 * @NoAdminRequired
-	 */
+	#[NoAdminRequired]
 	public function findAll(): DataResponse {
 		return new DataResponse($this->spaceService->findAll());
 	}
 
 	/**
-	 * @NoAdminRequired
-	 * @SpaceAdminRequired
+	 * @return DataResponse - The space serialized
 	 */
+	#[NoAdminRequired]
+	#[SpaceAdminRequired]
 	public function updateColorCode(string $colorCode, int $spaceId): DataResponse {
 		return new DataResponse($this->spaceService->updateColorCode($colorCode, (int)$spaceId));
 	}