nextcloud / server

lib/private/Files/Config/MountProviderCollection.php

Indentation +161 added lines, -161 removed lines

@@ -35,165 +35,165 @@
 use OCP\IUser;
 
 class MountProviderCollection implements IMountProviderCollection, Emitter {
-	use EmitterTrait;
-
-	/**
-	 * @var \OCP\Files\Config\IHomeMountProvider[]
-	 */
-	private $homeProviders = [];
-
-	/**
-	 * @var \OCP\Files\Config\IMountProvider[]
-	 */
-	private $providers = array();
-
-	/**
-	 * @var \OCP\Files\Storage\IStorageFactory
-	 */
-	private $loader;
-
-	/**
-	 * @var \OCP\Files\Config\IUserMountCache
-	 */
-	private $mountCache;
-
-	/** @var callable[] */
-	private $mountFilters = [];
-
-	/**
-	 * @param \OCP\Files\Storage\IStorageFactory $loader
-	 * @param IUserMountCache $mountCache
-	 */
-	public function __construct(IStorageFactory $loader, IUserMountCache $mountCache) {
-		$this->loader = $loader;
-		$this->mountCache = $mountCache;
-	}
-
-	/**
-	 * Get all configured mount points for the user
-	 *
-	 * @param \OCP\IUser $user
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 */
-	public function getMountsForUser(IUser $user) {
-		$loader = $this->loader;
-		$mounts = array_map(function (IMountProvider $provider) use ($user, $loader) {
-			return $provider->getMountsForUser($user, $loader);
-		}, $this->providers);
-		$mounts = array_filter($mounts, function ($result) {
-			return is_array($result);
-		});
-		$mounts = array_reduce($mounts, function (array $mounts, array $providerMounts) {
-			return array_merge($mounts, $providerMounts);
-		}, array());
-		return $this->filterMounts($user, $mounts);
-	}
-
-	public function addMountForUser(IUser $user, IMountManager $mountManager) {
-		// shared mount provider gets to go last since it needs to know existing files
-		// to check for name collisions
-		$firstMounts = [];
-		$firstProviders = array_filter($this->providers, function (IMountProvider $provider) {
-			return (get_class($provider) !== 'OCA\Files_Sharing\MountProvider');
-		});
-		$lastProviders = array_filter($this->providers, function (IMountProvider $provider) {
-			return (get_class($provider) === 'OCA\Files_Sharing\MountProvider');
-		});
-		foreach ($firstProviders as $provider) {
-			$mounts = $provider->getMountsForUser($user, $this->loader);
-			if (is_array($mounts)) {
-				$firstMounts = array_merge($firstMounts, $mounts);
-			}
-		}
-		$firstMounts = $this->filterMounts($user, $firstMounts);
-		array_walk($firstMounts, [$mountManager, 'addMount']);
-
-		$lateMounts = [];
-		foreach ($lastProviders as $provider) {
-			$mounts = $provider->getMountsForUser($user, $this->loader);
-			if (is_array($mounts)) {
-				$lateMounts = array_merge($lateMounts, $mounts);
-			}
-		}
-
-		$lateMounts = $this->filterMounts($user, $lateMounts);
-		array_walk($lateMounts, [$mountManager, 'addMount']);
-
-		return array_merge($lateMounts, $firstMounts);
-	}
-
-	/**
-	 * Get the configured home mount for this user
-	 *
-	 * @param \OCP\IUser $user
-	 * @return \OCP\Files\Mount\IMountPoint
-	 * @since 9.1.0
-	 */
-	public function getHomeMountForUser(IUser $user) {
-		/** @var \OCP\Files\Config\IHomeMountProvider[] $providers */
-		$providers = array_reverse($this->homeProviders); // call the latest registered provider first to give apps an opportunity to overwrite builtin
-		foreach ($providers as $homeProvider) {
-			if ($mount = $homeProvider->getHomeMountForUser($user, $this->loader)) {
-				$mount->setMountPoint('/' . $user->getUID()); //make sure the mountpoint is what we expect
-				return $mount;
-			}
-		}
-		throw new \Exception('No home storage configured for user ' . $user);
-	}
-
-	/**
-	 * Add a provider for mount points
-	 *
-	 * @param \OCP\Files\Config\IMountProvider $provider
-	 */
-	public function registerProvider(IMountProvider $provider) {
-		$this->providers[] = $provider;
-
-		$this->emit('\OC\Files\Config', 'registerMountProvider', [$provider]);
-	}
-
-	public function registerMountFilter(callable $filter) {
-		$this->mountFilters[] = $filter;
-	}
-
-	private function filterMounts(IUser $user, array $mountPoints) {
-		return array_filter($mountPoints, function (IMountPoint $mountPoint) use ($user) {
-			foreach ($this->mountFilters as $filter) {
-				if ($filter($mountPoint, $user) === false) {
-					return false;
-				}
-			}
-			return true;
-		});
-	}
-
-	/**
-	 * Add a provider for home mount points
-	 *
-	 * @param \OCP\Files\Config\IHomeMountProvider $provider
-	 * @since 9.1.0
-	 */
-	public function registerHomeProvider(IHomeMountProvider $provider) {
-		$this->homeProviders[] = $provider;
-		$this->emit('\OC\Files\Config', 'registerHomeMountProvider', [$provider]);
-	}
-
-	/**
-	 * Cache mounts for user
-	 *
-	 * @param IUser $user
-	 * @param IMountPoint[] $mountPoints
-	 */
-	public function registerMounts(IUser $user, array $mountPoints) {
-		$this->mountCache->registerMounts($user, $mountPoints);
-	}
-
-	/**
-	 * Get the mount cache which can be used to search for mounts without setting up the filesystem
-	 *
-	 * @return IUserMountCache
-	 */
-	public function getMountCache() {
-		return $this->mountCache;
-	}
+    use EmitterTrait;
+
+    /**
+     * @var \OCP\Files\Config\IHomeMountProvider[]
+     */
+    private $homeProviders = [];
+
+    /**
+     * @var \OCP\Files\Config\IMountProvider[]
+     */
+    private $providers = array();
+
+    /**
+     * @var \OCP\Files\Storage\IStorageFactory
+     */
+    private $loader;
+
+    /**
+     * @var \OCP\Files\Config\IUserMountCache
+     */
+    private $mountCache;
+
+    /** @var callable[] */
+    private $mountFilters = [];
+
+    /**
+     * @param \OCP\Files\Storage\IStorageFactory $loader
+     * @param IUserMountCache $mountCache
+     */
+    public function __construct(IStorageFactory $loader, IUserMountCache $mountCache) {
+        $this->loader = $loader;
+        $this->mountCache = $mountCache;
+    }
+
+    /**
+     * Get all configured mount points for the user
+     *
+     * @param \OCP\IUser $user
+     * @return \OCP\Files\Mount\IMountPoint[]
+     */
+    public function getMountsForUser(IUser $user) {
+        $loader = $this->loader;
+        $mounts = array_map(function (IMountProvider $provider) use ($user, $loader) {
+            return $provider->getMountsForUser($user, $loader);
+        }, $this->providers);
+        $mounts = array_filter($mounts, function ($result) {
+            return is_array($result);
+        });
+        $mounts = array_reduce($mounts, function (array $mounts, array $providerMounts) {
+            return array_merge($mounts, $providerMounts);
+        }, array());
+        return $this->filterMounts($user, $mounts);
+    }
+
+    public function addMountForUser(IUser $user, IMountManager $mountManager) {
+        // shared mount provider gets to go last since it needs to know existing files
+        // to check for name collisions
+        $firstMounts = [];
+        $firstProviders = array_filter($this->providers, function (IMountProvider $provider) {
+            return (get_class($provider) !== 'OCA\Files_Sharing\MountProvider');
+        });
+        $lastProviders = array_filter($this->providers, function (IMountProvider $provider) {
+            return (get_class($provider) === 'OCA\Files_Sharing\MountProvider');
+        });
+        foreach ($firstProviders as $provider) {
+            $mounts = $provider->getMountsForUser($user, $this->loader);
+            if (is_array($mounts)) {
+                $firstMounts = array_merge($firstMounts, $mounts);
+            }
+        }
+        $firstMounts = $this->filterMounts($user, $firstMounts);
+        array_walk($firstMounts, [$mountManager, 'addMount']);
+
+        $lateMounts = [];
+        foreach ($lastProviders as $provider) {
+            $mounts = $provider->getMountsForUser($user, $this->loader);
+            if (is_array($mounts)) {
+                $lateMounts = array_merge($lateMounts, $mounts);
+            }
+        }
+
+        $lateMounts = $this->filterMounts($user, $lateMounts);
+        array_walk($lateMounts, [$mountManager, 'addMount']);
+
+        return array_merge($lateMounts, $firstMounts);
+    }
+
+    /**
+     * Get the configured home mount for this user
+     *
+     * @param \OCP\IUser $user
+     * @return \OCP\Files\Mount\IMountPoint
+     * @since 9.1.0
+     */
+    public function getHomeMountForUser(IUser $user) {
+        /** @var \OCP\Files\Config\IHomeMountProvider[] $providers */
+        $providers = array_reverse($this->homeProviders); // call the latest registered provider first to give apps an opportunity to overwrite builtin
+        foreach ($providers as $homeProvider) {
+            if ($mount = $homeProvider->getHomeMountForUser($user, $this->loader)) {
+                $mount->setMountPoint('/' . $user->getUID()); //make sure the mountpoint is what we expect
+                return $mount;
+            }
+        }
+        throw new \Exception('No home storage configured for user ' . $user);
+    }
+
+    /**
+     * Add a provider for mount points
+     *
+     * @param \OCP\Files\Config\IMountProvider $provider
+     */
+    public function registerProvider(IMountProvider $provider) {
+        $this->providers[] = $provider;
+
+        $this->emit('\OC\Files\Config', 'registerMountProvider', [$provider]);
+    }
+
+    public function registerMountFilter(callable $filter) {
+        $this->mountFilters[] = $filter;
+    }
+
+    private function filterMounts(IUser $user, array $mountPoints) {
+        return array_filter($mountPoints, function (IMountPoint $mountPoint) use ($user) {
+            foreach ($this->mountFilters as $filter) {
+                if ($filter($mountPoint, $user) === false) {
+                    return false;
+                }
+            }
+            return true;
+        });
+    }
+
+    /**
+     * Add a provider for home mount points
+     *
+     * @param \OCP\Files\Config\IHomeMountProvider $provider
+     * @since 9.1.0
+     */
+    public function registerHomeProvider(IHomeMountProvider $provider) {
+        $this->homeProviders[] = $provider;
+        $this->emit('\OC\Files\Config', 'registerHomeMountProvider', [$provider]);
+    }
+
+    /**
+     * Cache mounts for user
+     *
+     * @param IUser $user
+     * @param IMountPoint[] $mountPoints
+     */
+    public function registerMounts(IUser $user, array $mountPoints) {
+        $this->mountCache->registerMounts($user, $mountPoints);
+    }
+
+    /**
+     * Get the mount cache which can be used to search for mounts without setting up the filesystem
+     *
+     * @return IUserMountCache
+     */
+    public function getMountCache() {
+        return $this->mountCache;
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -77,13 +77,13 @@ 
 	 */
 	public function getMountsForUser(IUser $user) {
 		$loader = $this->loader;
-		$mounts = array_map(function (IMountProvider $provider) use ($user, $loader) {
+		$mounts = array_map(function(IMountProvider $provider) use ($user, $loader) {
 			return $provider->getMountsForUser($user, $loader);
 		}, $this->providers);
-		$mounts = array_filter($mounts, function ($result) {
+		$mounts = array_filter($mounts, function($result) {
 			return is_array($result);
 		});
-		$mounts = array_reduce($mounts, function (array $mounts, array $providerMounts) {
+		$mounts = array_reduce($mounts, function(array $mounts, array $providerMounts) {
 			return array_merge($mounts, $providerMounts);
 		}, array());
 		return $this->filterMounts($user, $mounts);
@@ -93,10 +93,10 @@ 
 		// shared mount provider gets to go last since it needs to know existing files
 		// to check for name collisions
 		$firstMounts = [];
-		$firstProviders = array_filter($this->providers, function (IMountProvider $provider) {
+		$firstProviders = array_filter($this->providers, function(IMountProvider $provider) {
 			return (get_class($provider) !== 'OCA\Files_Sharing\MountProvider');
 		});
-		$lastProviders = array_filter($this->providers, function (IMountProvider $provider) {
+		$lastProviders = array_filter($this->providers, function(IMountProvider $provider) {
 			return (get_class($provider) === 'OCA\Files_Sharing\MountProvider');
 		});
 		foreach ($firstProviders as $provider) {
@@ -134,11 +134,11 @@ 
 		$providers = array_reverse($this->homeProviders); // call the latest registered provider first to give apps an opportunity to overwrite builtin
 		foreach ($providers as $homeProvider) {
 			if ($mount = $homeProvider->getHomeMountForUser($user, $this->loader)) {
-				$mount->setMountPoint('/' . $user->getUID()); //make sure the mountpoint is what we expect
+				$mount->setMountPoint('/'.$user->getUID()); //make sure the mountpoint is what we expect
 				return $mount;
 			}
 		}
-		throw new \Exception('No home storage configured for user ' . $user);
+		throw new \Exception('No home storage configured for user '.$user);
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	}
 
 	private function filterMounts(IUser $user, array $mountPoints) {
-		return array_filter($mountPoints, function (IMountPoint $mountPoint) use ($user) {
+		return array_filter($mountPoints, function(IMountPoint $mountPoint) use ($user) {
 			foreach ($this->mountFilters as $filter) {
 				if ($filter($mountPoint, $user) === false) {
 					return false;

lib/public/Files/Config/IMountProviderCollection.php

Indentation +44 added lines, -44 removed lines

@@ -30,53 +30,53 @@
  * @since 8.0.0
  */
 interface IMountProviderCollection {
-	/**
-	 * Get all configured mount points for the user
-	 *
-	 * @param \OCP\IUser $user
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 * @since 8.0.0
-	 */
-	public function getMountsForUser(IUser $user);
+    /**
+     * Get all configured mount points for the user
+     *
+     * @param \OCP\IUser $user
+     * @return \OCP\Files\Mount\IMountPoint[]
+     * @since 8.0.0
+     */
+    public function getMountsForUser(IUser $user);
 
-	/**
-	 * Get the configured home mount for this user
-	 *
-	 * @param \OCP\IUser $user
-	 * @return \OCP\Files\Mount\IMountPoint
-	 * @since 9.1.0
-	 */
-	public function getHomeMountForUser(IUser $user);
+    /**
+     * Get the configured home mount for this user
+     *
+     * @param \OCP\IUser $user
+     * @return \OCP\Files\Mount\IMountPoint
+     * @since 9.1.0
+     */
+    public function getHomeMountForUser(IUser $user);
 
-	/**
-	 * Add a provider for mount points
-	 *
-	 * @param \OCP\Files\Config\IMountProvider $provider
-	 * @since 8.0.0
-	 */
-	public function registerProvider(IMountProvider $provider);
+    /**
+     * Add a provider for mount points
+     *
+     * @param \OCP\Files\Config\IMountProvider $provider
+     * @since 8.0.0
+     */
+    public function registerProvider(IMountProvider $provider);
 
-	/**
-	 * Add a filter for mounts
-	 *
-	 * @param callable $filter (IMountPoint $mountPoint, IUser $user) => boolean
-	 * @since 14.0.0
-	 */
-	public function registerMountFilter(callable $filter);
+    /**
+     * Add a filter for mounts
+     *
+     * @param callable $filter (IMountPoint $mountPoint, IUser $user) => boolean
+     * @since 14.0.0
+     */
+    public function registerMountFilter(callable $filter);
 
-	/**
-	 * Add a provider for home mount points
-	 *
-	 * @param \OCP\Files\Config\IHomeMountProvider $provider
-	 * @since 9.1.0
-	 */
-	public function registerHomeProvider(IHomeMountProvider $provider);
+    /**
+     * Add a provider for home mount points
+     *
+     * @param \OCP\Files\Config\IHomeMountProvider $provider
+     * @since 9.1.0
+     */
+    public function registerHomeProvider(IHomeMountProvider $provider);
 
-	/**
-	 * Get the mount cache which can be used to search for mounts without setting up the filesystem
-	 *
-	 * @return IUserMountCache
-	 * @since 9.0.0
-	 */
-	public function getMountCache();
+    /**
+     * Get the mount cache which can be used to search for mounts without setting up the filesystem
+     *
+     * @return IUserMountCache
+     * @since 9.0.0
+     */
+    public function getMountCache();
 }