refactor: index providers by class in MountProviderCollection

Signed-off-by: Salvatore Martire <[email protected]>

Author: salmart-dev

lib/private/Files/Config/MountProviderCollection.php

@@ -9,6 +9,7 @@
 
 use OC\Hooks\Emitter;
 use OC\Hooks\EmitterTrait;
+use OCA\Files_Sharing\MountProvider;
 use OCP\Diagnostics\IEventLogger;
 use OCP\Files\Cache\ICacheEntry;
 use OCP\Files\Config\ICachedMountInfo;
@@ -22,6 +23,8 @@
 use OCP\Files\Mount\IMountPoint;
 use OCP\Files\Storage\IStorageFactory;
 use OCP\IUser;
+use function get_class;
+use function in_array;
 
 class MountProviderCollection implements IMountProviderCollection, Emitter {
 	use EmitterTrait;
@@ -32,7 +35,7 @@ class MountProviderCollection implements IMountProviderCollection, Emitter {
 	private array $homeProviders = [];
 
 	/**
-	 * @var list<IMountProvider>
+	 * @var array<class-string<IMountProvider>, IMountProvider>
 	 */
 	private array $providers = [];
 
@@ -78,7 +81,7 @@ private function getUserMountsForProviders(IUser $user, array $providers): array
 	 * @return list<IMountPoint>
 	 */
 	public function getMountsForUser(IUser $user): array {
-		return $this->getUserMountsForProviders($user, $this->providers);
+		return $this->getUserMountsForProviders($user, array_values($this->providers));
 	}
 
 	/**
@@ -120,8 +123,12 @@ public function getUserMountsFromProviderByPath(
 	 * @return list<IMountPoint>
 	 */
 	public function getUserMountsForProviderClasses(IUser $user, array $mountProviderClasses): array {
-		$providers = $this->getProvidersByClass($this->providers, $mountProviderClasses);
-		return $this->getUserMountsForProviders($user, array_values($providers));
+		$providers = array_filter(
+			$this->providers,
+			fn (string $providerClass) => in_array($providerClass, $mountProviderClasses),
+			ARRAY_FILTER_USE_KEY
+		);
+		return $this->getUserMountsForProviders($user, $providers);
 	}
 
 	/**
@@ -132,16 +139,21 @@ public function addMountForUser(IUser $user, IMountManager $mountManager, ?calla
 		// to check for name collisions
 		$firstMounts = [];
 		if ($providerFilter) {
-			$providers = array_filter($this->providers, $providerFilter);
+			$providers = array_filter($this->providers, $providerFilter, ARRAY_FILTER_USE_KEY);
 		} else {
 			$providers = $this->providers;
 		}
-		$firstProviders = array_filter($providers, function (IMountProvider $provider) {
-			return (get_class($provider) !== 'OCA\Files_Sharing\MountProvider');
-		});
-		$lastProviders = array_filter($providers, function (IMountProvider $provider) {
-			return (get_class($provider) === 'OCA\Files_Sharing\MountProvider');
-		});
+		$firstProviders
+			= array_filter(
+				$providers,
+				fn (string $providerClass) => ($providerClass !== MountProvider::class),
+				ARRAY_FILTER_USE_KEY
+			);
+		$lastProviders = array_filter(
+			$providers,
+			fn (string $providerClass) => $providerClass === MountProvider::class,
+			ARRAY_FILTER_USE_KEY
+		);
 		foreach ($firstProviders as $provider) {
 			$mounts = $this->getMountsFromProvider($provider, $user, $this->loader);
 			$firstMounts = array_merge($firstMounts, $mounts);
@@ -183,7 +195,7 @@ public function getHomeMountForUser(IUser $user): IMountPoint {
 	 * Add a provider for mount points
 	 */
 	public function registerProvider(IMountProvider $provider): void {
-		$this->providers[] = $provider;
+		$this->providers[get_class($provider)] = $provider;
 
 		$this->emit('\OC\Files\Config', 'registerMountProvider', [$provider]);
 	}
@@ -261,7 +273,7 @@ public function clearProviders(): void {
 	 * @return list<IMountProvider>
 	 */
 	public function getProviders(): array {
-		return $this->providers;
+		return array_values($this->providers);
 	}
 
 	/**

lib/private/Files/SetupManager.php

@@ -56,6 +56,7 @@
 use OCP\Lockdown\ILockdownManager;
 use OCP\Share\Events\ShareCreatedEvent;
 use Psr\Log\LoggerInterface;
+use function in_array;
 
 class SetupManager {
 	private bool $rootSetup = false;
@@ -209,9 +210,9 @@ public function setupForUser(IUser $user): void {
 
 		$this->setupForUserWith($user, function () use ($user) {
 			$this->mountProviderCollection->addMountForUser($user, $this->mountManager, function (
-				IMountProvider $provider,
+				string $providerClass,
 			) use ($user) {
-				return !in_array(get_class($provider), $this->setupUserMountProviders[$user->getUID()]);
+				return !in_array($providerClass, $this->setupUserMountProviders[$user->getUID()]);
 			});
 		});
 		$this->afterUserFullySetup($user, $previouslySetupProviders);