move teardown logic to SetupManager

Signed-off-by: Robin Appelman <robin@icewind.nl>

1 files changed, 10 insertions, 12 deletions

diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php
index e439b746bf6..0c444d5cd34 100644
--- a/lib/private/Files/Filesystem.php
+++ b/lib/private/Files/Filesystem.php
@@ -41,7 +41,9 @@ use OC\Cache\CappedMemoryCache;
 use OC\Files\Config\MountProviderCollection;
 use OC\Files\Mount\MountPoint;
 use OC\Lockdown\Filesystem\NullStorage;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Config\IMountProvider;
+use OCP\Files\Events\Node\FilesystemTearedDownEvent;
 use OCP\Files\NotFoundException;
 use OCP\Files\Storage\IStorageFactory;
 use OCP\ILogger;
@@ -332,6 +334,13 @@ class Filesystem {
 		}
 		self::getLoader();
 		self::$defaultInstance = new View($root);
+		/** @var IEventDispatcher $eventDispatcher */
+		$eventDispatcher = \OC::$server->get(IEventDispatcher::class);
+		$eventDispatcher->addListener(FilesystemTearedDownEvent::class, function () {
+			self::$defaultInstance = null;
+			self::$usersSetup = [];
+			self::$loaded = false;
+		});
 
 		if (!self::$mounts) {
 			self::$mounts = \OC::$server->getMountManager();
@@ -474,8 +483,7 @@ class Filesystem {
 	 * tear down the filesystem, removing all storage providers
 	 */
 	public static function tearDown() {
-		self::clearMounts();
-		self::$defaultInstance = null;
+		\OC_Util::tearDownFS();
 	}
 
 	/**
@@ -493,16 +501,6 @@ class Filesystem {
 	}
 
 	/**
-	 * clear all mounts and storage backends
-	 */
-	public static function clearMounts() {
-		if (self::$mounts) {
-			self::$usersSetup = [];
-			self::$mounts->clear();
-		}
-	}
-
-	/**
 	 * mount an \OC\Files\Storage\Storage in our virtual filesystem
 	 *
 	 * @param \OC\Files\Storage\Storage|string $class