Merge pull request #31007 from nextcloud/enhancement/bootstrap-calendar-resource-room-backend-registration

Move calendar resource/room backend registration to IBootstrap

3 files changed, 38 insertions, 4 deletions

diff --git a/lib/public/AppFramework/Bootstrap/IRegistrationContext.php b/lib/public/AppFramework/Bootstrap/IRegistrationContext.php
index 19b5665f547..89583912e00 100644
--- a/lib/public/AppFramework/Bootstrap/IRegistrationContext.php
+++ b/lib/public/AppFramework/Bootstrap/IRegistrationContext.php
@@ -275,4 +275,24 @@ interface IRegistrationContext {
 	 * @since 24.0.0
 	 */
 	public function registerTalkBackend(string $backend): void;
+
+	/**
+	 * Register a resource backend for the DAV server
+	 *
+	 * @param string $actionClass
+	 * @psalm-param class-string<\OCP\Calendar\Resource\IBackend> $actionClass
+	 * @return void
+	 * @since 24.0.0
+	 */
+	public function registerCalendarResourceBackend(string $class): void;
+
+	/**
+	 * Register a room backend for the DAV server
+	 *
+	 * @param string $actionClass
+	 * @psalm-param class-string<\OCP\Calendar\Room\IBackend> $actionClass
+	 * @return void
+	 * @since 24.0.0
+	 */
+	public function registerCalendarRoomBackend(string $class): void;
 }
diff --git a/lib/public/Calendar/Resource/IManager.php b/lib/public/Calendar/Resource/IManager.php
index 6910ecb164c..268cf8ec633 100644
--- a/lib/public/Calendar/Resource/IManager.php
+++ b/lib/public/Calendar/Resource/IManager.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * @copyright 2018, Georg Ehrke <oc.list@georgehrke.com>
  *
@@ -23,9 +26,8 @@
 namespace OCP\Calendar\Resource;
 
 /**
- * Interface IManager
- *
  * @since 14.0.0
+ * @deprecated 24.0.0
  */
 interface IManager {
 
@@ -35,6 +37,7 @@ interface IManager {
 	 * @param string $backendClass
 	 * @return void
 	 * @since 14.0.0
+	 * @deprecated 24.0.0 use \OCP\AppFramework\Bootstrap\IRegistrationContext::registerCalendarResourceBackend
 	 */
 	public function registerBackend(string $backendClass);
 
@@ -44,12 +47,14 @@ interface IManager {
 	 * @param string $backendClass
 	 * @return void
 	 * @since 14.0.0
+	 * @deprecated 24.0.0
 	 */
 	public function unregisterBackend(string $backendClass);
 
 	/**
 	 * @return IBackend[]
 	 * @since 14.0.0
+	 * @deprecated 24.0.0
 	 */
 	public function getBackends():array;
 
@@ -57,6 +62,7 @@ interface IManager {
 	 * @param string $backendId
 	 * @return IBackend|null
 	 * @since 14.0.0
+	 * @deprecated 24.0.0
 	 */
 	public function getBackend($backendId);
 
@@ -64,6 +70,7 @@ interface IManager {
 	 * removes all registered backend instances
 	 * @return void
 	 * @since 14.0.0
+	 * @deprecated 24.0.0
 	 */
 	public function clear();
 }
diff --git a/lib/public/Calendar/Room/IManager.php b/lib/public/Calendar/Room/IManager.php
index 6529ad265b6..c55f3fd4ae4 100644
--- a/lib/public/Calendar/Room/IManager.php
+++ b/lib/public/Calendar/Room/IManager.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * @copyright 2018, Georg Ehrke <oc.list@georgehrke.com>
  *
@@ -23,9 +26,8 @@
 namespace OCP\Calendar\Room;
 
 /**
- * Interface IManager
- *
  * @since 14.0.0
+ * @deprecated 24.0.0
  */
 interface IManager {
 
@@ -35,6 +37,7 @@ interface IManager {
 	 * @param string $backendClass
 	 * @return void
 	 * @since 14.0.0
+	 * @deprecated 24.0.0 use \OC\AppFramework\Bootstrap\::registerCalendarRoomBackend
 	 */
 	public function registerBackend(string $backendClass);
 
@@ -44,12 +47,14 @@ interface IManager {
 	 * @param string $backendClass
 	 * @return void
 	 * @since 14.0.0
+	 * @deprecated 24.0.0
 	 */
 	public function unregisterBackend(string $backendClass);
 
 	/**
 	 * @return IBackend[]
 	 * @since 14.0.0
+	 * @deprecated 24.0.0
 	 */
 	public function getBackends():array;
 
@@ -57,6 +62,7 @@ interface IManager {
 	 * @param string $backendId
 	 * @return IBackend|null
 	 * @since 14.0.0
+	 * @deprecated 24.0.0
 	 */
 	public function getBackend($backendId);
 
@@ -64,6 +70,7 @@ interface IManager {
 	 * removes all registered backend instances
 	 * @return void
 	 * @since 14.0.0
+	 * @deprecated 24.0.0
 	 */
 	public function clear();
 }