Merge branch 'stable21' into backport/29479/stable21

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

diff --cc psalm.xml
index bc21dbceffeac28664dbb930c15c7e4301b1d92e,a075ceb24a786683e4296eb657ce0c9f7c85427b..4f75af61dde9fa9365dd56967aef489e89cdd1fe
--- 1/psalm.xml
--- 2/psalm.xml
+++ b/psalm.xml
@@@ -80,8 -80,7 +80,9 @@@
                <UndefinedClass>
                        <errorLevel type="suppress">
                                <referencedClass name="OCA\GroupFolders\Mount\GroupFolderStorage"/>
+                               <referencedClass name="OCA\TwoFactorNextcloudNotification\Controller\APIController"/>
 +                              <!-- Classes from PHP>=8 (needed to be able to use \GdImage::class) -->
 +                              <referencedClass name="GdImage" />
                        </errorLevel>
                </UndefinedClass>
                <UndefinedFunction>