chore: Unify user related events to always provide a `getUid` method

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

diff --git a/core/Events/BeforePasswordResetEvent.php b/core/Events/BeforePasswordResetEvent.php
index bd437479150c3a46287b9ee7b7280fa1f7bfa481..428ebfeefadc4533eb29fd405228d693d3a0c8bf 100644 (file)
--- a/core/Events/BeforePasswordResetEvent.php
+++ b/core/Events/BeforePasswordResetEvent.php
@@ -34,6 +34,13 @@ class BeforePasswordResetEvent extends Event {
                return $this->user;
        }
 
+       /**
+        * @since 31.0.0
+        */
+       public function getUid(): string {
+               return $this->user->getUID();
+       }
+
        /**
         * @since 25.0.0
         */

diff --git a/core/Events/PasswordResetEvent.php b/core/Events/PasswordResetEvent.php
index a159c71026332c9783a0fe5175a01c4c839982e2..868899513212fcbf2f90bf9f5d23878308f547ee 100644 (file)
--- a/core/Events/PasswordResetEvent.php
+++ b/core/Events/PasswordResetEvent.php
@@ -34,6 +34,13 @@ class PasswordResetEvent extends Event {
                return $this->user;
        }
 
+       /**
+        * @since 31.0.0
+        */
+       public function getUid(): string {
+               return $this->user->getUID();
+       }
+
        /**
         * @since 25.0.0
         */

diff --git a/lib/public/AppFramework/Bootstrap/IRegistrationContext.php b/lib/public/AppFramework/Bootstrap/IRegistrationContext.php
index 57e76f268d986544b4ef051744e2801623d429a0..b9e5413e5c26081b1af6a8b57060543aba6c4415 100644 (file)
--- a/lib/public/AppFramework/Bootstrap/IRegistrationContext.php
+++ b/lib/public/AppFramework/Bootstrap/IRegistrationContext.php
@@ -69,7 +69,7 @@ interface IRegistrationContext {
         * @param string $name
         * @param callable $factory
         * @psalm-param callable(\Psr\Container\ContainerInterface): mixed $factory
-        * @param bool $shared
+        * @param bool $shared If set to true the factory result will be cached otherwise every query will call the factory again
         *
         * @return void
         * @see IContainer::registerService()

diff --git a/lib/public/User/Events/PasswordUpdatedEvent.php b/lib/public/User/Events/PasswordUpdatedEvent.php
index 948b69e54b742081c46fc874ff89bfb70f28a46e..d3fd8f078fed24380a4e78a607c2733461b34b84 100644 (file)
--- a/lib/public/User/Events/PasswordUpdatedEvent.php
+++ b/lib/public/User/Events/PasswordUpdatedEvent.php
@@ -49,6 +49,13 @@ class PasswordUpdatedEvent extends Event {
                return $this->user;
        }
 
+       /**
+        * @since 31.0.0
+        */
+       public function getUid(): string {
+               return $this->user->getUID();
+       }
+
        /**
         * @return string
         * @since 18.0.0

diff --git a/lib/public/User/Events/UserDeletedEvent.php b/lib/public/User/Events/UserDeletedEvent.php
index c5b8e11c888fa2e718d3b93ff2fe02809645e63e..9b74ff960630ce0f9eb9c5ff58655d76382e4c0c 100644 (file)
--- a/lib/public/User/Events/UserDeletedEvent.php
+++ b/lib/public/User/Events/UserDeletedEvent.php
@@ -34,4 +34,11 @@ class UserDeletedEvent extends Event {
        public function getUser(): IUser {
                return $this->user;
        }
+
+       /**
+        * @since 31.0.0
+        */
+       public function getUid(): string {
+               return $this->user->getUID();
+       }
 }

diff --git a/lib/public/User/Events/UserLoggedInEvent.php b/lib/public/User/Events/UserLoggedInEvent.php
index 61a7b1f79cdba50b18b5c37f3def65c065d483ac..53f61073a5966ebfd90b56772bef50828c3f84e5 100644 (file)
--- a/lib/public/User/Events/UserLoggedInEvent.php
+++ b/lib/public/User/Events/UserLoggedInEvent.php
@@ -45,6 +45,13 @@ class UserLoggedInEvent extends Event {
                return $this->user;
        }
 
+       /**
+        * @since 31.0.0
+        */
+       public function getUid(): string {
+               return $this->user->getUID();
+       }
+
        /**
         * @since 21.0.0
         */