2 files changed, 62 insertions, 11 deletions

diff --git a/lib/private/Files/Mount/Manager.php b/lib/private/Files/Mount/Manager.php
index fc78d71adb4..5544b218658 100644
--- a/lib/private/Files/Mount/Manager.php
+++ b/lib/private/Files/Mount/Manager.php
@@ -26,18 +26,16 @@ declare(strict_types=1);
  * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace OC\Files\Mount;
 
 use OC\Cache\CappedMemoryCache;
 use OC\Files\Filesystem;
 use OC\Files\SetupManager;
-use OCP\Diagnostics\IEventLogger;
-use OCP\EventDispatcher\IEventDispatcher;
-use OCP\Files\Config\IMountProviderCollection;
+use OC\Files\SetupManagerFactory;
 use OCP\Files\Mount\IMountManager;
 use OCP\Files\Mount\IMountPoint;
 use OCP\Files\NotFoundException;
-use OCP\IUserManager;
 
 class Manager implements IMountManager {
 	/** @var MountPoint[] */
@@ -48,15 +46,10 @@ class Manager implements IMountManager {
 	private CappedMemoryCache $inPathCache;
 	private SetupManager $setupManager;
 
-	public function __construct(
-		IEventLogger $eventLogger,
-		IMountProviderCollection $mountProviderCollection,
-		IUserManager $userManager,
-		IEventDispatcher $eventDispatcher
-	) {
+	public function __construct(SetupManagerFactory $setupManagerFactory) {
 		$this->pathCache = new CappedMemoryCache();
 		$this->inPathCache = new CappedMemoryCache();
-		$this->setupManager = new SetupManager($eventLogger, $mountProviderCollection, $this, $userManager, $eventDispatcher);
+		$this->setupManager = $setupManagerFactory->create($this);
 	}
 
 	/**
diff --git a/lib/private/Files/SetupManagerFactory.php b/lib/private/Files/SetupManagerFactory.php
new file mode 100644
index 00000000000..21628984256
--- /dev/null
+++ b/lib/private/Files/SetupManagerFactory.php
@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2022 Robin Appelman <robin@icewind.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Files;
+
+use OCP\Diagnostics\IEventLogger;
+use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Files\Config\IMountProviderCollection;
+use OCP\Files\Mount\IMountManager;
+use OCP\IUserManager;
+
+class SetupManagerFactory {
+	private IEventLogger $eventLogger;
+	private IMountProviderCollection $mountProviderCollection;
+	private IUserManager $userManager;
+	private IEventDispatcher $eventDispatcher;
+	private ?SetupManager $setupManager;
+
+	public function __construct(
+		IEventLogger $eventLogger,
+		IMountProviderCollection $mountProviderCollection,
+		IUserManager $userManager,
+		IEventDispatcher $eventDispatcher
+	) {
+		$this->eventLogger = $eventLogger;
+		$this->mountProviderCollection = $mountProviderCollection;
+		$this->userManager = $userManager;
+		$this->eventDispatcher = $eventDispatcher;
+		$this->setupManager = null;
+	}
+
+	public function create(IMountManager $mountManager): SetupManager {
+		if (!$this->setupManager) {
+			$this->setupManager = new SetupManager($this->eventLogger, $this->mountProviderCollection, $mountManager, $this->userManager, $this->eventDispatcher);
+		}
+		return $this->setupManager;
+	}
+}