fix(teams): add consumable and implementable annotations

fix: tests for TeamFolderProvider and TeamManager
Assisted-by: GitHub Copilot:GPT-5.6 Terra

Signed-off-by: Stefan Dietrich <5716289+stediefan@users.noreply.github.com>

Author: stediefan

apps/dav/composer/composer/autoload_static.php

@@ -7,14 +7,14 @@
 class ComposerStaticInitDAV
 {
     public static $prefixLengthsPsr4 = array (
-        'O' => 
+        'O' =>
         array (
             'OCA\\DAV\\' => 8,
         ),
     );
 
     public static $prefixDirsPsr4 = array (
-        'OCA\\DAV\\' => 
+        'OCA\\DAV\\' =>
         array (
             0 => __DIR__ . '/..' . '/../lib',
         ),

lib/composer/composer/autoload_classmap.php

@@ -1023,9 +1023,11 @@
     'OCP\\TaskProcessing\\TaskTypes\\TextToTextSummary' => $baseDir . '/lib/public/TaskProcessing/TaskTypes/TextToTextSummary.php',
     'OCP\\TaskProcessing\\TaskTypes\\TextToTextTopics' => $baseDir . '/lib/public/TaskProcessing/TaskTypes/TextToTextTopics.php',
     'OCP\\TaskProcessing\\TaskTypes\\TextToTextTranslate' => $baseDir . '/lib/public/TaskProcessing/TaskTypes/TextToTextTranslate.php',
+    'OCP\\Teams\\ITeamFolderProvider' => $baseDir . '/lib/public/Teams/ITeamFolderProvider.php',
     'OCP\\Teams\\ITeamManager' => $baseDir . '/lib/public/Teams/ITeamManager.php',
     'OCP\\Teams\\ITeamResourceProvider' => $baseDir . '/lib/public/Teams/ITeamResourceProvider.php',
     'OCP\\Teams\\Team' => $baseDir . '/lib/public/Teams/Team.php',
+    'OCP\\Teams\\TeamFolder' => $baseDir . '/lib/public/Teams/TeamFolder.php',
     'OCP\\Teams\\TeamResource' => $baseDir . '/lib/public/Teams/TeamResource.php',
     'OCP\\Template' => $baseDir . '/lib/public/Template.php',
     'OCP\\Template\\ITemplate' => $baseDir . '/lib/public/Template/ITemplate.php',

lib/composer/composer/autoload_static.php

@@ -1064,9 +1064,11 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OCP\\TaskProcessing\\TaskTypes\\TextToTextSummary' => __DIR__ . '/../../..' . '/lib/public/TaskProcessing/TaskTypes/TextToTextSummary.php',
         'OCP\\TaskProcessing\\TaskTypes\\TextToTextTopics' => __DIR__ . '/../../..' . '/lib/public/TaskProcessing/TaskTypes/TextToTextTopics.php',
         'OCP\\TaskProcessing\\TaskTypes\\TextToTextTranslate' => __DIR__ . '/../../..' . '/lib/public/TaskProcessing/TaskTypes/TextToTextTranslate.php',
+        'OCP\\Teams\\ITeamFolderProvider' => __DIR__ . '/../../..' . '/lib/public/Teams/ITeamFolderProvider.php',
         'OCP\\Teams\\ITeamManager' => __DIR__ . '/../../..' . '/lib/public/Teams/ITeamManager.php',
         'OCP\\Teams\\ITeamResourceProvider' => __DIR__ . '/../../..' . '/lib/public/Teams/ITeamResourceProvider.php',
         'OCP\\Teams\\Team' => __DIR__ . '/../../..' . '/lib/public/Teams/Team.php',
+        'OCP\\Teams\\TeamFolder' => __DIR__ . '/../../..' . '/lib/public/Teams/TeamFolder.php',
         'OCP\\Teams\\TeamResource' => __DIR__ . '/../../..' . '/lib/public/Teams/TeamResource.php',
         'OCP\\Template' => __DIR__ . '/../../..' . '/lib/public/Template.php',
         'OCP\\Template\\ITemplate' => __DIR__ . '/../../..' . '/lib/public/Template/ITemplate.php',

lib/private/Teams/TeamManager.php

@@ -15,8 +15,8 @@
 use OCA\Circles\Model\Probes\CircleProbe;
 use OCP\IURLGenerator;
 use OCP\Server;
-use OCP\Teams\ITeamManager;
 use OCP\Teams\ITeamFolderProvider;
+use OCP\Teams\ITeamManager;
 use OCP\Teams\ITeamResourceProvider;
 use OCP\Teams\Team;
 use Psr\Container\ContainerExceptionInterface;

lib/public/Teams/ITeamFolderProvider.php

@@ -9,6 +9,9 @@
 
 namespace OCP\Teams;
 
+use OCP\AppFramework\Attribute\Consumable;
+use OCP\AppFramework\Attribute\Implementable;
+
 /**
  * Provides the exclusive folder belonging to a team.
  *
@@ -17,6 +20,8 @@
  *
  * @since 35.0.0
  */
+#[Consumable(since: '35.0.0')]
+#[Implementable(since: '35.0.0')]
 interface ITeamFolderProvider extends ITeamResourceProvider {
 	/**
 	 * Return the folder exclusively linked to the team.

lib/public/Teams/TeamFolder.php

@@ -9,11 +9,14 @@
 
 namespace OCP\Teams;
 
+use OCP\AppFramework\Attribute\Consumable;
+
 /**
  * A folder exclusively linked to a team.
  *
  * @since 35.0.0
  */
+#[Consumable(since: '35.0.0')]
 class TeamFolder implements \JsonSerializable {
 	/**
 	 * @since 35.0.0

tests/lib/Teams/TeamManagerTest.php

@@ -11,21 +11,20 @@
 
 use OC\AppFramework\Bootstrap\Coordinator;
 use OC\Teams\TeamManager;
-use OCA\Circles\CirclesManager;
 use OCP\IURLGenerator;
 use OCP\Teams\ITeamFolderProvider;
 use OCP\Teams\ITeamResourceProvider;
 use Test\TestCase;
 
 class TeamManagerTest extends TestCase {
 	public function testGetTeamFolderProviderReturnsNullWithoutTeamSupport(): void {
-		$teamManager = $this->createTeamManager(null);
+		$teamManager = $this->createTeamManager();
 
 		$this->assertNull($teamManager->getTeamFolderProvider());
 	}
 
 	public function testGetTeamFolderProviderReturnsNullWithoutFolderProvider(): void {
-		$teamManager = $this->createTeamManager($this->createMock(CirclesManager::class));
+		$teamManager = $this->createTeamManager(true);
 		$this->setProviders($teamManager, [
 			'other' => $this->createMock(ITeamResourceProvider::class),
 		]);
@@ -34,7 +33,7 @@ public function testGetTeamFolderProviderReturnsNullWithoutFolderProvider(): voi
 	}
 
 	public function testGetTeamFolderProviderReturnsRegisteredFolderProvider(): void {
-		$teamManager = $this->createTeamManager($this->createMock(CirclesManager::class));
+		$teamManager = $this->createTeamManager(true);
 		$folderProvider = $this->createMock(ITeamFolderProvider::class);
 		$this->setProviders($teamManager, [
 			'other' => $this->createMock(ITeamResourceProvider::class),
@@ -44,12 +43,22 @@ public function testGetTeamFolderProviderReturnsRegisteredFolderProvider(): void
 		$this->assertSame($folderProvider, $teamManager->getTeamFolderProvider());
 	}
 
-	private function createTeamManager(?CirclesManager $circlesManager): TeamManager {
-		return new TeamManager(
-			$this->createMock(Coordinator::class),
-			$this->createMock(IURLGenerator::class),
-			$circlesManager,
-		);
+	private function createTeamManager(bool $hasTeamSupport = false): TeamManager {
+		return new class($this->createMock(Coordinator::class), $this->createMock(IURLGenerator::class), null, $hasTeamSupport, ) extends TeamManager {
+			public function __construct(
+				Coordinator $bootContext,
+				IURLGenerator $urlGenerator,
+				null $circlesManager,
+				private bool $hasTeamSupport,
+			) {
+				parent::__construct($bootContext, $urlGenerator, $circlesManager);
+			}
+
+			#[\Override]
+			public function hasTeamSupport(): bool {
+				return $this->hasTeamSupport;
+			}
+		};
 	}
 
 	/**
@@ -58,4 +67,4 @@ private function createTeamManager(?CirclesManager $circlesManager): TeamManager
 	private function setProviders(TeamManager $teamManager, array $providers): void {
 		(new \ReflectionProperty(TeamManager::class, 'providers'))->setValue($teamManager, $providers);
 	}
-}
+}