aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public
diff options
context:
space:
mode:
Diffstat (limited to 'lib/public')
-rw-r--r--lib/public/Config/BeforePreferenceDeletedEvent.php5
-rw-r--r--lib/public/Config/BeforePreferenceSetEvent.php5
-rw-r--r--lib/public/Config/Exceptions/IncorrectTypeException.php5
-rw-r--r--lib/public/Config/Exceptions/TypeConflictException.php5
-rw-r--r--lib/public/Config/Exceptions/UnknownKeyException.php5
-rw-r--r--lib/public/Config/IUserConfig.php2
-rw-r--r--lib/public/Config/Lexicon/Entry.php3
-rw-r--r--lib/public/Config/Lexicon/ILexicon.php4
-rw-r--r--lib/public/Config/Lexicon/Preset.php5
-rw-r--r--lib/public/Config/Lexicon/Strictness.php5
-rw-r--r--lib/public/Config/ValueType.php4
-rw-r--r--lib/public/Federation/ICloudIdManager.php27
-rw-r--r--lib/public/Federation/ICloudIdResolver.php40
13 files changed, 87 insertions, 28 deletions
diff --git a/lib/public/Config/BeforePreferenceDeletedEvent.php b/lib/public/Config/BeforePreferenceDeletedEvent.php
index c7026b0f6fc..df89a2900bd 100644
--- a/lib/public/Config/BeforePreferenceDeletedEvent.php
+++ b/lib/public/Config/BeforePreferenceDeletedEvent.php
@@ -8,11 +8,10 @@ declare(strict_types=1);
namespace OCP\Config;
+use OCP\AppFramework\Attribute\Listenable;
use OCP\EventDispatcher\Event;
-/**
- * @since 25.0.0
- */
+#[Listenable(since: '25.0.0')]
class BeforePreferenceDeletedEvent extends Event {
protected string $userId;
protected string $appId;
diff --git a/lib/public/Config/BeforePreferenceSetEvent.php b/lib/public/Config/BeforePreferenceSetEvent.php
index c5abb8429a8..6534e4ae371 100644
--- a/lib/public/Config/BeforePreferenceSetEvent.php
+++ b/lib/public/Config/BeforePreferenceSetEvent.php
@@ -8,11 +8,10 @@ declare(strict_types=1);
namespace OCP\Config;
+use OCP\AppFramework\Attribute\Listenable;
use OCP\EventDispatcher\Event;
-/**
- * @since 25.0.0
- */
+#[Listenable(since: '25.0.0')]
class BeforePreferenceSetEvent extends Event {
protected string $userId;
protected string $appId;
diff --git a/lib/public/Config/Exceptions/IncorrectTypeException.php b/lib/public/Config/Exceptions/IncorrectTypeException.php
index 33c545c7eea..dea33233bfe 100644
--- a/lib/public/Config/Exceptions/IncorrectTypeException.php
+++ b/lib/public/Config/Exceptions/IncorrectTypeException.php
@@ -9,9 +9,8 @@ declare(strict_types=1);
namespace OCP\Config\Exceptions;
use Exception;
+use OCP\AppFramework\Attribute\Throwable;
-/**
- * @since 32.0.0
- */
+#[Throwable(since: '32.0.0')]
class IncorrectTypeException extends Exception {
}
diff --git a/lib/public/Config/Exceptions/TypeConflictException.php b/lib/public/Config/Exceptions/TypeConflictException.php
index 4b63bb0a763..c78602180e0 100644
--- a/lib/public/Config/Exceptions/TypeConflictException.php
+++ b/lib/public/Config/Exceptions/TypeConflictException.php
@@ -9,9 +9,8 @@ declare(strict_types=1);
namespace OCP\Config\Exceptions;
use Exception;
+use OCP\AppFramework\Attribute\Throwable;
-/**
- * @since 32.0.0
- */
+#[Throwable(since: '32.0.0')]
class TypeConflictException extends Exception {
}
diff --git a/lib/public/Config/Exceptions/UnknownKeyException.php b/lib/public/Config/Exceptions/UnknownKeyException.php
index 39da4d43d95..beca4c496a2 100644
--- a/lib/public/Config/Exceptions/UnknownKeyException.php
+++ b/lib/public/Config/Exceptions/UnknownKeyException.php
@@ -9,9 +9,8 @@ declare(strict_types=1);
namespace OCP\Config\Exceptions;
use Exception;
+use OCP\AppFramework\Attribute\Throwable;
-/**
- * @since 32.0.0
- */
+#[Throwable(since: '32.0.0')]
class UnknownKeyException extends Exception {
}
diff --git a/lib/public/Config/IUserConfig.php b/lib/public/Config/IUserConfig.php
index 1179db2671f..cb42608ea75 100644
--- a/lib/public/Config/IUserConfig.php
+++ b/lib/public/Config/IUserConfig.php
@@ -27,8 +27,6 @@ use OCP\Config\Exceptions\UnknownKeyException;
* Similarly, some methods from this class are marked with a warning about ignoring
* lazy loading. Use them wisely and only on parts of the code that are called
* during specific requests or actions to avoid loading the lazy values all the time.
- *
- * @since 32.0.0
*/
#[Consumable(since: '32.0.0')]
interface IUserConfig {
diff --git a/lib/public/Config/Lexicon/Entry.php b/lib/public/Config/Lexicon/Entry.php
index 95dae44ed11..0e6e664db36 100644
--- a/lib/public/Config/Lexicon/Entry.php
+++ b/lib/public/Config/Lexicon/Entry.php
@@ -9,14 +9,15 @@ declare(strict_types=1);
namespace OCP\Config\Lexicon;
use Closure;
+use OCP\AppFramework\Attribute\Consumable;
use OCP\Config\ValueType;
/**
* Model that represent config values within an app config lexicon.
*
* @see ILexicon
- * @since 32.0.0
*/
+#[Consumable(since: '32.0.0')]
class Entry {
/** @since 32.0.0 */
public const RENAME_INVERT_BOOLEAN = 1;
diff --git a/lib/public/Config/Lexicon/ILexicon.php b/lib/public/Config/Lexicon/ILexicon.php
index 1dde23714cb..05bf5967f24 100644
--- a/lib/public/Config/Lexicon/ILexicon.php
+++ b/lib/public/Config/Lexicon/ILexicon.php
@@ -8,16 +8,12 @@ declare(strict_types=1);
namespace OCP\Config\Lexicon;
-use OCP\AppFramework\Attribute\Consumable;
use OCP\AppFramework\Attribute\Implementable;
/**
* This interface needs to be implemented if you want to define a config lexicon for your application
* The config lexicon is used to avoid conflicts and problems when storing/retrieving config values
- *
- * @since 32.0.0
*/
-#[Consumable(since: '32.0.0')]
#[Implementable(since: '32.0.0')]
interface ILexicon {
diff --git a/lib/public/Config/Lexicon/Preset.php b/lib/public/Config/Lexicon/Preset.php
index ba0fb66dd3b..6dac8736131 100644
--- a/lib/public/Config/Lexicon/Preset.php
+++ b/lib/public/Config/Lexicon/Preset.php
@@ -8,6 +8,8 @@ declare(strict_types=1);
namespace OCP\Config\Lexicon;
+use OCP\AppFramework\Attribute\Consumable;
+
/**
* list of preset to handle the default behavior of the instance
*
@@ -22,9 +24,8 @@ namespace OCP\Config\Lexicon;
* - **Preset::CLUB** - Club/Association
* - **Preset::FAMILY** - Family
* - **Preset::PRIVATE** - Private
- *
- * @since 32.0.0
*/
+#[Consumable(since: '32.0.0')]
enum Preset: int {
/** @since 32.0.0 */
case LARGE = 9;
diff --git a/lib/public/Config/Lexicon/Strictness.php b/lib/public/Config/Lexicon/Strictness.php
index 48e96bfc91c..8136499cb3e 100644
--- a/lib/public/Config/Lexicon/Strictness.php
+++ b/lib/public/Config/Lexicon/Strictness.php
@@ -8,6 +8,8 @@ declare(strict_types=1);
namespace OCP\Config\Lexicon;
+use OCP\AppFramework\Attribute\Consumable;
+
/**
* Strictness regarding using not-listed config keys
*
@@ -15,9 +17,8 @@ namespace OCP\Config\Lexicon;
* - **Strictness::NOTICE** - ignore and report
* - **Strictness::WARNING** - silently block (returns $default) and report
* - **Strictness::EXCEPTION** - block (throws exception) and report
- *
- * @since 32.0.0
*/
+#[Consumable(since: '32.0.0')]
enum Strictness {
/** @since 32.0.0 */
case IGNORE; // fully ignore
diff --git a/lib/public/Config/ValueType.php b/lib/public/Config/ValueType.php
index a622c671898..32c734af32b 100644
--- a/lib/public/Config/ValueType.php
+++ b/lib/public/Config/ValueType.php
@@ -8,15 +8,15 @@ declare(strict_types=1);
namespace OCP\Config;
+use OCP\AppFramework\Attribute\Consumable;
use OCP\Config\Exceptions\IncorrectTypeException;
use OCP\IAppConfig;
use UnhandledMatchError;
/**
* Listing of available value type for typed config value
- *
- * @since 32.0.0
*/
+#[Consumable(since: '32.0.0')]
enum ValueType: int {
/**
* @since 32.0.0
diff --git a/lib/public/Federation/ICloudIdManager.php b/lib/public/Federation/ICloudIdManager.php
index 03b6ced18f5..29e261ab3af 100644
--- a/lib/public/Federation/ICloudIdManager.php
+++ b/lib/public/Federation/ICloudIdManager.php
@@ -8,11 +8,14 @@ declare(strict_types=1);
*/
namespace OCP\Federation;
+use OCP\AppFramework\Attribute\Consumable;
+
/**
* Interface for resolving federated cloud ids
*
* @since 12.0.0
*/
+#[Consumable(since: '12.0.0')]
interface ICloudIdManager {
/**
* @param string $cloudId
@@ -55,4 +58,28 @@ interface ICloudIdManager {
* @since 30.0.0 - Optional parameter $httpsOnly was added
*/
public function removeProtocolFromUrl(string $url, bool $httpsOnly = false): string;
+
+ /**
+ * @param string $id The remote cloud id
+ * @param string $user The user id on the remote server
+ * @param string $remote The base address of the remote server
+ * @param ?string $displayName The displayname of the remote user
+ *
+ * @since 32.0.0
+ */
+ public function createCloudId(string $id, string $user, string $remote, ?string $displayName = null): ICloudId;
+
+ /**
+ * @param $resolver The cloud id resolver to register
+ *
+ * @since 32.0.0
+ */
+ public function registerCloudIdResolver(ICloudIdResolver $resolver): void;
+
+ /**
+ * @param $resolver The cloud id resolver to unregister
+ *
+ * @since 32.0.0
+ */
+ public function unregisterCloudIdResolver(ICloudIdResolver $resolver): void;
}
diff --git a/lib/public/Federation/ICloudIdResolver.php b/lib/public/Federation/ICloudIdResolver.php
new file mode 100644
index 00000000000..79f9ed11dd7
--- /dev/null
+++ b/lib/public/Federation/ICloudIdResolver.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+namespace OCP\Federation;
+
+use OCP\AppFramework\Attribute\Consumable;
+use OCP\AppFramework\Attribute\Implementable;
+
+/**
+ * Interface for resolving federated cloud ids
+ *
+ * @since 32.0.0
+ */
+#[Consumable(since: '32.0.0')]
+#[Implementable(since: '32.0.0')]
+interface ICloudIdResolver {
+ /**
+ * @param string $cloudId
+ * @return ICloudId
+ * @throws \InvalidArgumentException
+ *
+ * @since 32.0.0
+ */
+ public function resolveCloudId(string $cloudId): ICloudId;
+
+ /**
+ * Check if the input is a correctly formatted cloud id
+ *
+ * @param string $cloudId
+ * @return bool
+ *
+ * @since 32.0.0
+ */
+ public function isValidCloudId(string $cloudId): bool;
+}