From 0b1f4947c41e1f2e30ef98ae01c6939ee551396f Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Mon, 27 Jul 2026 19:57:31 +0200 Subject: [PATCH] chore: Add attributes to public interfaces Signed-off-by: Carl Schwan --- .../Group/Backend/IAddToGroupBackend.php | 3 ++ .../Group/Backend/IBatchMethodsBackend.php | 3 ++ .../Group/Backend/ICountDisabledInGroup.php | 3 ++ .../Group/Backend/ICountUsersBackend.php | 3 ++ .../Group/Backend/ICreateGroupBackend.php | 3 ++ .../Backend/ICreateNamedGroupBackend.php | 3 ++ .../Group/Backend/IDeleteGroupBackend.php | 3 ++ .../Group/Backend/IGetDisplayNameBackend.php | 3 ++ .../Group/Backend/IGroupDetailsBackend.php | 3 ++ .../Backend/IHideFromCollaborationBackend.php | 3 ++ lib/public/Group/Backend/IIsAdminBackend.php | 3 ++ lib/public/Group/Backend/INamedBackend.php | 3 ++ .../Group/Backend/IRemoveFromGroupBackend.php | 3 ++ .../Group/Backend/ISearchableGroupBackend.php | 2 + .../Group/Backend/ISetDisplayNameBackend.php | 3 ++ .../Group/Events/BeforeGroupChangedEvent.php | 37 +++++------------- .../Group/Events/BeforeGroupCreatedEvent.php | 10 ++--- .../Group/Events/BeforeGroupDeletedEvent.php | 11 +++--- .../Group/Events/BeforeUserAddedEvent.php | 16 +++----- .../Group/Events/BeforeUserRemovedEvent.php | 17 +++------ lib/public/Group/Events/GroupChangedEvent.php | 38 +++++-------------- lib/public/Group/Events/GroupCreatedEvent.php | 11 +++--- lib/public/Group/Events/GroupDeletedEvent.php | 11 +++--- .../Group/Events/SubAdminAddedEvent.php | 15 +++----- .../Group/Events/SubAdminRemovedEvent.php | 15 +++----- lib/public/Group/Events/UserAddedEvent.php | 17 +++------ lib/public/Group/Events/UserRemovedEvent.php | 17 +++------ lib/public/User/Events/UserDeletedEvent.php | 12 +++--- 28 files changed, 125 insertions(+), 146 deletions(-) diff --git a/lib/public/Group/Backend/IAddToGroupBackend.php b/lib/public/Group/Backend/IAddToGroupBackend.php index eab757f313dcb..36bd541b7e35a 100644 --- a/lib/public/Group/Backend/IAddToGroupBackend.php +++ b/lib/public/Group/Backend/IAddToGroupBackend.php @@ -9,9 +9,12 @@ namespace OCP\Group\Backend; +use OCP\AppFramework\Attribute\Implementable; + /** * @since 14.0.0 */ +#[Implementable(since: '14.0.0')] interface IAddToGroupBackend { /** * @since 14.0.0 diff --git a/lib/public/Group/Backend/IBatchMethodsBackend.php b/lib/public/Group/Backend/IBatchMethodsBackend.php index 9ed8248d5698b..2155800d5c69d 100644 --- a/lib/public/Group/Backend/IBatchMethodsBackend.php +++ b/lib/public/Group/Backend/IBatchMethodsBackend.php @@ -9,10 +9,13 @@ namespace OCP\Group\Backend; +use OCP\AppFramework\Attribute\Implementable; + /** * @brief Optional interface for group backends * @since 28.0.0 */ +#[Implementable(since: '28.0.0')] interface IBatchMethodsBackend { /** * @brief Batch method to check if a list of groups exists diff --git a/lib/public/Group/Backend/ICountDisabledInGroup.php b/lib/public/Group/Backend/ICountDisabledInGroup.php index cb1316c21a711..3ac206ab8279d 100644 --- a/lib/public/Group/Backend/ICountDisabledInGroup.php +++ b/lib/public/Group/Backend/ICountDisabledInGroup.php @@ -9,9 +9,12 @@ namespace OCP\Group\Backend; +use OCP\AppFramework\Attribute\Implementable; + /** * @since 14.0.0 */ +#[Implementable(since: '14.0.0')] interface ICountDisabledInGroup { /** * @since 14.0.0 diff --git a/lib/public/Group/Backend/ICountUsersBackend.php b/lib/public/Group/Backend/ICountUsersBackend.php index d6001eaca1bcb..7e063347ed191 100644 --- a/lib/public/Group/Backend/ICountUsersBackend.php +++ b/lib/public/Group/Backend/ICountUsersBackend.php @@ -9,9 +9,12 @@ namespace OCP\Group\Backend; +use OCP\AppFramework\Attribute\Implementable; + /** * @since 14.0.0 */ +#[Implementable(since: '14.0.0')] interface ICountUsersBackend { /** * @since 14.0.0 diff --git a/lib/public/Group/Backend/ICreateGroupBackend.php b/lib/public/Group/Backend/ICreateGroupBackend.php index e7412c8418c40..9006ee8b2af09 100644 --- a/lib/public/Group/Backend/ICreateGroupBackend.php +++ b/lib/public/Group/Backend/ICreateGroupBackend.php @@ -9,10 +9,13 @@ namespace OCP\Group\Backend; +use OCP\AppFramework\Attribute\Implementable; + /** * @since 14.0.0 * @deprecated 30.0.0 Use ICreateNamedGroupBackend instead */ +#[Implementable(since: '14.0.0')] interface ICreateGroupBackend { /** * @since 14.0.0 diff --git a/lib/public/Group/Backend/ICreateNamedGroupBackend.php b/lib/public/Group/Backend/ICreateNamedGroupBackend.php index d2bfd80596d59..dea270b27ed14 100644 --- a/lib/public/Group/Backend/ICreateNamedGroupBackend.php +++ b/lib/public/Group/Backend/ICreateNamedGroupBackend.php @@ -9,9 +9,12 @@ namespace OCP\Group\Backend; +use OCP\AppFramework\Attribute\Implementable; + /** * @since 30.0.0 */ +#[Implementable(since: '30.0.0')] interface ICreateNamedGroupBackend { /** * Tries to create a group from its name. diff --git a/lib/public/Group/Backend/IDeleteGroupBackend.php b/lib/public/Group/Backend/IDeleteGroupBackend.php index 59fe5b629b571..9a14230e427f3 100644 --- a/lib/public/Group/Backend/IDeleteGroupBackend.php +++ b/lib/public/Group/Backend/IDeleteGroupBackend.php @@ -9,9 +9,12 @@ namespace OCP\Group\Backend; +use OCP\AppFramework\Attribute\Implementable; + /** * @since 14.0.0 */ +#[Implementable(since: '14.0.0')] interface IDeleteGroupBackend { /** * @since 14.0.0 diff --git a/lib/public/Group/Backend/IGetDisplayNameBackend.php b/lib/public/Group/Backend/IGetDisplayNameBackend.php index 6a5daefcc0785..2d6ad1cbea7cd 100644 --- a/lib/public/Group/Backend/IGetDisplayNameBackend.php +++ b/lib/public/Group/Backend/IGetDisplayNameBackend.php @@ -9,9 +9,12 @@ namespace OCP\Group\Backend; +use OCP\AppFramework\Attribute\Implementable; + /** * @since 17.0.0 */ +#[Implementable(since: '17.0.0')] interface IGetDisplayNameBackend { /** * @param string $gid diff --git a/lib/public/Group/Backend/IGroupDetailsBackend.php b/lib/public/Group/Backend/IGroupDetailsBackend.php index ae78cec16cef2..e24fe849ea7b6 100644 --- a/lib/public/Group/Backend/IGroupDetailsBackend.php +++ b/lib/public/Group/Backend/IGroupDetailsBackend.php @@ -9,10 +9,13 @@ namespace OCP\Group\Backend; +use OCP\AppFramework\Attribute\Implementable; + /** * @brief Optional interface for group backends * @since 14.0.0 */ +#[Implementable(since: '14.0.0')] interface IGroupDetailsBackend { /** * @brief Get additional details for a group, for example the display name. diff --git a/lib/public/Group/Backend/IHideFromCollaborationBackend.php b/lib/public/Group/Backend/IHideFromCollaborationBackend.php index 28e3572da7fea..cdafb6776b1ce 100644 --- a/lib/public/Group/Backend/IHideFromCollaborationBackend.php +++ b/lib/public/Group/Backend/IHideFromCollaborationBackend.php @@ -9,11 +9,14 @@ namespace OCP\Group\Backend; +use OCP\AppFramework\Attribute\Implementable; + /** * @since 16.0.0 * * Allow the backend to mark groups to be excluded from being shown in search dialogs */ +#[Implementable(since: '16.0.0')] interface IHideFromCollaborationBackend { /** * Check if a group should be hidden from search dialogs diff --git a/lib/public/Group/Backend/IIsAdminBackend.php b/lib/public/Group/Backend/IIsAdminBackend.php index 1044e9d404a56..9e5af6e1a6e74 100644 --- a/lib/public/Group/Backend/IIsAdminBackend.php +++ b/lib/public/Group/Backend/IIsAdminBackend.php @@ -9,9 +9,12 @@ namespace OCP\Group\Backend; +use OCP\AppFramework\Attribute\Implementable; + /** * @since 14.0.0 */ +#[Implementable(since: '14.0.0')] interface IIsAdminBackend { /** * @since 14.0.0 diff --git a/lib/public/Group/Backend/INamedBackend.php b/lib/public/Group/Backend/INamedBackend.php index d7ab0828e0acb..391276cc2f048 100644 --- a/lib/public/Group/Backend/INamedBackend.php +++ b/lib/public/Group/Backend/INamedBackend.php @@ -7,9 +7,12 @@ namespace OCP\Group\Backend; +use OCP\AppFramework\Attribute\Implementable; + /** * @since 22.0.0 */ +#[Implementable(since: '22.0.0')] interface INamedBackend { /** * Backend name to be shown in group management diff --git a/lib/public/Group/Backend/IRemoveFromGroupBackend.php b/lib/public/Group/Backend/IRemoveFromGroupBackend.php index 0bc6ac76c2899..7bb262cb05b2c 100644 --- a/lib/public/Group/Backend/IRemoveFromGroupBackend.php +++ b/lib/public/Group/Backend/IRemoveFromGroupBackend.php @@ -9,9 +9,12 @@ namespace OCP\Group\Backend; +use OCP\AppFramework\Attribute\Implementable; + /** * @since 14.0.0 */ +#[Implementable(since: '14.0.0')] interface IRemoveFromGroupBackend { /** * @since 14.0.0 diff --git a/lib/public/Group/Backend/ISearchableGroupBackend.php b/lib/public/Group/Backend/ISearchableGroupBackend.php index 9fecf7e41f0f2..bc8e1cb76b2a5 100644 --- a/lib/public/Group/Backend/ISearchableGroupBackend.php +++ b/lib/public/Group/Backend/ISearchableGroupBackend.php @@ -9,11 +9,13 @@ namespace OCP\Group\Backend; +use OCP\AppFramework\Attribute\Implementable; use OCP\IUser; /** * @since 27.0.0 */ +#[Implementable(since: '27.0.0')] interface ISearchableGroupBackend { /** * @brief Get a list of users matching the given search parameters. diff --git a/lib/public/Group/Backend/ISetDisplayNameBackend.php b/lib/public/Group/Backend/ISetDisplayNameBackend.php index 70deb49b65dd8..859676351a69e 100644 --- a/lib/public/Group/Backend/ISetDisplayNameBackend.php +++ b/lib/public/Group/Backend/ISetDisplayNameBackend.php @@ -9,9 +9,12 @@ namespace OCP\Group\Backend; +use OCP\AppFramework\Attribute\Implementable; + /** * @since 18.0.0 */ +#[Implementable(since: '18.0.0')] interface ISetDisplayNameBackend { /** * @param string $gid diff --git a/lib/public/Group/Events/BeforeGroupChangedEvent.php b/lib/public/Group/Events/BeforeGroupChangedEvent.php index 6ddcd42d0e3ee..3df3c00c50bf1 100644 --- a/lib/public/Group/Events/BeforeGroupChangedEvent.php +++ b/lib/public/Group/Events/BeforeGroupChangedEvent.php @@ -9,49 +9,37 @@ namespace OCP\Group\Events; +use OCP\AppFramework\Attribute\Implementable; use OCP\EventDispatcher\Event; use OCP\IGroup; /** * @since 26.0.0 */ +#[Implementable(since: '26.0.0')] class BeforeGroupChangedEvent extends Event { - private IGroup $group; - private string $feature; - /** @var mixed */ - private $value; - /** @var mixed */ - private $oldValue; /** * @since 26.0.0 */ - public function __construct(IGroup $group, - string $feature, - $value, - $oldValue = null) { + public function __construct( + private readonly IGroup $group, + private readonly string $feature, + private readonly mixed $value, + private readonly mixed $oldValue = null, + ) { parent::__construct(); - $this->group = $group; - $this->feature = $feature; - $this->value = $value; - $this->oldValue = $oldValue; } /** - * * @since 26.0.0 - * - * @return IGroup */ public function getGroup(): IGroup { return $this->group; } /** - * * @since 26.0.0 - * - * @return string */ public function getFeature(): string { return $this->feature; @@ -59,20 +47,15 @@ public function getFeature(): string { /** * @since 26.0.0 - * - * @return mixed */ - public function getValue() { + public function getValue(): mixed { return $this->value; } /** - * * @since 26.0.0 - * - * @return mixed */ - public function getOldValue() { + public function getOldValue(): mixed { return $this->oldValue; } } diff --git a/lib/public/Group/Events/BeforeGroupCreatedEvent.php b/lib/public/Group/Events/BeforeGroupCreatedEvent.php index eb43304df82ce..13ba1de411662 100644 --- a/lib/public/Group/Events/BeforeGroupCreatedEvent.php +++ b/lib/public/Group/Events/BeforeGroupCreatedEvent.php @@ -9,21 +9,21 @@ namespace OCP\Group\Events; +use OCP\AppFramework\Attribute\Implementable; use OCP\EventDispatcher\Event; /** * @since 18.0.0 */ +#[Implementable(since: '18.0.0')] class BeforeGroupCreatedEvent extends Event { - /** @var string */ - private $name; - /** * @since 18.0.0 */ - public function __construct(string $name) { + public function __construct( + private readonly string $name, + ) { parent::__construct(); - $this->name = $name; } /** diff --git a/lib/public/Group/Events/BeforeGroupDeletedEvent.php b/lib/public/Group/Events/BeforeGroupDeletedEvent.php index 48fbb629a6279..1f2429110b863 100644 --- a/lib/public/Group/Events/BeforeGroupDeletedEvent.php +++ b/lib/public/Group/Events/BeforeGroupDeletedEvent.php @@ -9,26 +9,25 @@ namespace OCP\Group\Events; +use OCP\AppFramework\Attribute\Implementable; use OCP\EventDispatcher\Event; use OCP\IGroup; /** * @since 18.0.0 */ +#[Implementable(since: '18.0.0')] class BeforeGroupDeletedEvent extends Event { - /** @var IGroup */ - private $group; - /** * @since 18.0.0 */ - public function __construct(IGroup $group) { + public function __construct( + private readonly IGroup $group, + ) { parent::__construct(); - $this->group = $group; } /** - * @return IGroup * @since 18.0.0 */ public function getGroup(): IGroup { diff --git a/lib/public/Group/Events/BeforeUserAddedEvent.php b/lib/public/Group/Events/BeforeUserAddedEvent.php index 1bac10bb5dd82..f237d571e60e9 100644 --- a/lib/public/Group/Events/BeforeUserAddedEvent.php +++ b/lib/public/Group/Events/BeforeUserAddedEvent.php @@ -9,6 +9,7 @@ namespace OCP\Group\Events; +use OCP\AppFramework\Attribute\Listenable; use OCP\EventDispatcher\Event; use OCP\IGroup; use OCP\IUser; @@ -16,24 +17,19 @@ /** * @since 18.0.0 */ +#[Listenable(since: '18.0.0')] class BeforeUserAddedEvent extends Event { - /** @var IGroup */ - private $group; - - /*** @var IUser */ - private $user; - /** * @since 18.0.0 */ - public function __construct(IGroup $group, IUser $user) { + public function __construct( + private readonly IGroup $group, + private readonly IUser $user, + ) { parent::__construct(); - $this->group = $group; - $this->user = $user; } /** - * @return IGroup * @since 18.0.0 */ public function getGroup(): IGroup { diff --git a/lib/public/Group/Events/BeforeUserRemovedEvent.php b/lib/public/Group/Events/BeforeUserRemovedEvent.php index 3c661f1285e6f..c059a751fab40 100644 --- a/lib/public/Group/Events/BeforeUserRemovedEvent.php +++ b/lib/public/Group/Events/BeforeUserRemovedEvent.php @@ -9,6 +9,7 @@ namespace OCP\Group\Events; +use OCP\AppFramework\Attribute\Implementable; use OCP\EventDispatcher\Event; use OCP\IGroup; use OCP\IUser; @@ -20,25 +21,20 @@ * case please reach out in the issue tracker at * https://github.com/nextcloud/server/issues */ +#[Implementable(since: '18.0.0')] class BeforeUserRemovedEvent extends Event { - /** @var IGroup */ - private $group; - - /*** @var IUser */ - private $user; - /** * @since 18.0.0 * @deprecated 20.0.0 */ - public function __construct(IGroup $group, IUser $user) { + public function __construct( + private readonly IGroup $group, + private readonly IUser $user, + ) { parent::__construct(); - $this->group = $group; - $this->user = $user; } /** - * @return IGroup * @since 18.0.0 * @deprecated 20.0.0 */ @@ -47,7 +43,6 @@ public function getGroup(): IGroup { } /** - * @return IUser * @since 18.0.0 * @deprecated 20.0.0 */ diff --git a/lib/public/Group/Events/GroupChangedEvent.php b/lib/public/Group/Events/GroupChangedEvent.php index b8206f9d943aa..3f417c0f98ded 100644 --- a/lib/public/Group/Events/GroupChangedEvent.php +++ b/lib/public/Group/Events/GroupChangedEvent.php @@ -9,49 +9,36 @@ namespace OCP\Group\Events; +use OCP\AppFramework\Attribute\Implementable; use OCP\EventDispatcher\Event; use OCP\IGroup; /** * @since 26.0.0 */ +#[Implementable(since: '21.0.0')] class GroupChangedEvent extends Event { - private IGroup $group; - private string $feature; - /** @var mixed */ - private $value; - /** @var mixed */ - private $oldValue; - /** * @since 26.0.0 */ - public function __construct(IGroup $group, - string $feature, - $value, - $oldValue = null) { + public function __construct( + private readonly IGroup $group, + private readonly string $feature, + private readonly mixed $value, + private readonly mixed $oldValue = null, + ) { parent::__construct(); - $this->group = $group; - $this->feature = $feature; - $this->value = $value; - $this->oldValue = $oldValue; } /** - * * @since 26.0.0 - * - * @return IGroup */ public function getGroup(): IGroup { return $this->group; } /** - * * @since 26.0.0 - * - * @return string */ public function getFeature(): string { return $this->feature; @@ -59,20 +46,15 @@ public function getFeature(): string { /** * @since 26.0.0 - * - * @return mixed */ - public function getValue() { + public function getValue(): mixed { return $this->value; } /** - * * @since 26.0.0 - * - * @return mixed */ - public function getOldValue() { + public function getOldValue(): mixed { return $this->oldValue; } } diff --git a/lib/public/Group/Events/GroupCreatedEvent.php b/lib/public/Group/Events/GroupCreatedEvent.php index 44293f5a63a48..1e373acece439 100644 --- a/lib/public/Group/Events/GroupCreatedEvent.php +++ b/lib/public/Group/Events/GroupCreatedEvent.php @@ -9,26 +9,25 @@ namespace OCP\Group\Events; +use OCP\AppFramework\Attribute\Implementable; use OCP\EventDispatcher\Event; use OCP\IGroup; /** * @since 18.0.0 */ +#[Implementable(since: '21.0.0')] class GroupCreatedEvent extends Event { - /** @var IGroup */ - private $group; - /** * @since 18.0.0 */ - public function __construct(IGroup $group) { + public function __construct( + private readonly IGroup $group, + ) { parent::__construct(); - $this->group = $group; } /** - * @return IGroup * @since 18.0.0 */ public function getGroup(): IGroup { diff --git a/lib/public/Group/Events/GroupDeletedEvent.php b/lib/public/Group/Events/GroupDeletedEvent.php index 5f6ddfcd731b7..071a16db6c7d3 100644 --- a/lib/public/Group/Events/GroupDeletedEvent.php +++ b/lib/public/Group/Events/GroupDeletedEvent.php @@ -9,26 +9,25 @@ namespace OCP\Group\Events; +use OCP\AppFramework\Attribute\Listenable; use OCP\EventDispatcher\Event; use OCP\IGroup; /** * @since 18.0.0 */ +#[Listenable(since: '18.0.0')] class GroupDeletedEvent extends Event { - /** @var IGroup */ - private $group; - /** * @since 18.0.0 */ - public function __construct(IGroup $group) { + public function __construct( + private readonly IGroup $group, + ) { parent::__construct(); - $this->group = $group; } /** - * @return IGroup * @since 18.0.0 */ public function getGroup(): IGroup { diff --git a/lib/public/Group/Events/SubAdminAddedEvent.php b/lib/public/Group/Events/SubAdminAddedEvent.php index 5eb4131afcdee..bd299fdd0900f 100644 --- a/lib/public/Group/Events/SubAdminAddedEvent.php +++ b/lib/public/Group/Events/SubAdminAddedEvent.php @@ -9,6 +9,7 @@ namespace OCP\Group\Events; +use OCP\AppFramework\Attribute\Implementable; use OCP\EventDispatcher\Event; use OCP\IGroup; use OCP\IUser; @@ -16,20 +17,16 @@ /** * @since 21.0.0 */ +#[Implementable(since: '21.0.0')] class SubAdminAddedEvent extends Event { - /** @var IGroup */ - private $group; - - /*** @var IUser */ - private $user; - /** * @since 21.0.0 */ - public function __construct(IGroup $group, IUser $user) { + public function __construct( + private readonly IGroup $group, + private readonly IUser $user, + ) { parent::__construct(); - $this->group = $group; - $this->user = $user; } /** diff --git a/lib/public/Group/Events/SubAdminRemovedEvent.php b/lib/public/Group/Events/SubAdminRemovedEvent.php index c8b8ea5627c68..6eab775ce12b9 100644 --- a/lib/public/Group/Events/SubAdminRemovedEvent.php +++ b/lib/public/Group/Events/SubAdminRemovedEvent.php @@ -9,6 +9,7 @@ namespace OCP\Group\Events; +use OCP\AppFramework\Attribute\Implementable; use OCP\EventDispatcher\Event; use OCP\IGroup; use OCP\IUser; @@ -16,20 +17,16 @@ /** * @since 21.0.0 */ +#[Implementable(since: '21.0.0')] class SubAdminRemovedEvent extends Event { - /** @var IGroup */ - private $group; - - /*** @var IUser */ - private $user; - /** * @since 21.0.0 */ - public function __construct(IGroup $group, IUser $user) { + public function __construct( + private readonly IGroup $group, + private readonly IUser $user, + ) { parent::__construct(); - $this->group = $group; - $this->user = $user; } /** diff --git a/lib/public/Group/Events/UserAddedEvent.php b/lib/public/Group/Events/UserAddedEvent.php index 367e168b8d098..1309f67c00f4e 100644 --- a/lib/public/Group/Events/UserAddedEvent.php +++ b/lib/public/Group/Events/UserAddedEvent.php @@ -9,6 +9,7 @@ namespace OCP\Group\Events; +use OCP\AppFramework\Attribute\Implementable; use OCP\EventDispatcher\Event; use OCP\IGroup; use OCP\IUser; @@ -16,24 +17,19 @@ /** * @since 18.0.0 */ +#[Implementable(since: '18.0.0')] class UserAddedEvent extends Event { - /** @var IGroup */ - private $group; - - /*** @var IUser */ - private $user; - /** * @since 18.0.0 */ - public function __construct(IGroup $group, IUser $user) { + public function __construct( + private readonly IGroup $group, + private readonly IUser $user, + ) { parent::__construct(); - $this->group = $group; - $this->user = $user; } /** - * @return IGroup * @since 18.0.0 */ public function getGroup(): IGroup { @@ -41,7 +37,6 @@ public function getGroup(): IGroup { } /** - * @return IUser * @since 18.0.0 */ public function getUser(): IUser { diff --git a/lib/public/Group/Events/UserRemovedEvent.php b/lib/public/Group/Events/UserRemovedEvent.php index 7b88f31f95cd6..9ef23b6c26f1a 100644 --- a/lib/public/Group/Events/UserRemovedEvent.php +++ b/lib/public/Group/Events/UserRemovedEvent.php @@ -9,6 +9,7 @@ namespace OCP\Group\Events; +use OCP\AppFramework\Attribute\Implementable; use OCP\EventDispatcher\Event; use OCP\IGroup; use OCP\IUser; @@ -16,24 +17,19 @@ /** * @since 18.0.0 */ +#[Implementable(since: '18.0.0')] class UserRemovedEvent extends Event { - /** @var IGroup */ - private $group; - - /*** @var IUser */ - private $user; - /** * @since 18.0.0 */ - public function __construct(IGroup $group, IUser $user) { + public function __construct( + private readonly IGroup $group, + private readonly IUser $user, + ) { parent::__construct(); - $this->group = $group; - $this->user = $user; } /** - * @return IGroup * @since 18.0.0 */ public function getGroup(): IGroup { @@ -41,7 +37,6 @@ public function getGroup(): IGroup { } /** - * @return IUser * @since 18.0.0 */ public function getUser(): IUser { diff --git a/lib/public/User/Events/UserDeletedEvent.php b/lib/public/User/Events/UserDeletedEvent.php index 37aad2e83c3f5..5c7ae1e6977b2 100644 --- a/lib/public/User/Events/UserDeletedEvent.php +++ b/lib/public/User/Events/UserDeletedEvent.php @@ -9,27 +9,25 @@ namespace OCP\User\Events; +use OCP\AppFramework\Attribute\Listenable; use OCP\EventDispatcher\Event; use OCP\IUser; /** * @since 18.0.0 */ +#[Listenable(since: '18.0.0')] class UserDeletedEvent extends Event { - /** @var IUser */ - private $user; - /** - * @param IUser $user * @since 18.0.0 */ - public function __construct(IUser $user) { + public function __construct( + private readonly IUser $user, + ) { parent::__construct(); - $this->user = $user; } /** - * @return IUser * @since 18.0.0 */ public function getUser(): IUser {