2 files changed, 10 insertions, 42 deletions

diff --git a/lib/private/Support/CrashReport/Registry.php b/lib/private/Support/CrashReport/Registry.php
index 93969a81265..4fbbb8448ca 100644
--- a/lib/private/Support/CrashReport/Registry.php
+++ b/lib/private/Support/CrashReport/Registry.php
@@ -6,11 +6,12 @@ declare(strict_types=1);
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 namespace OC\Support\CrashReport;
 
 use Exception;
 use OCP\AppFramework\QueryException;
-use OCP\IServerContainer;
+use OCP\Server;
 use OCP\Support\CrashReport\ICollectBreadcrumbs;
 use OCP\Support\CrashReport\IMessageReporter;
 use OCP\Support\CrashReport\IRegistry;
@@ -26,17 +27,8 @@ class Registry implements IRegistry {
 	/** @var IReporter[] */
 	private $reporters = [];
 
-	/** @var IServerContainer */
-	private $serverContainer;
-
-	public function __construct(IServerContainer $serverContainer) {
-		$this->serverContainer = $serverContainer;
-	}
-
 	/**
 	 * Register a reporter instance
-	 *
-	 * @param IReporter $reporter
 	 */
 	public function register(IReporter $reporter): void {
 		$this->reporters[] = $reporter;
@@ -49,10 +41,6 @@ class Registry implements IRegistry {
 	/**
 	 * Delegate breadcrumb collection to all registered reporters
 	 *
-	 * @param string $message
-	 * @param string $category
-	 * @param array $context
-	 *
 	 * @since 15.0.0
 	 */
 	public function delegateBreadcrumb(string $message, string $category, array $context = []): void {
@@ -69,7 +57,6 @@ class Registry implements IRegistry {
 	 * Delegate crash reporting to all registered reporters
 	 *
 	 * @param Exception|Throwable $exception
-	 * @param array $context
 	 */
 	public function delegateReport($exception, array $context = []): void {
 		$this->loadLazyProviders();
@@ -82,9 +69,6 @@ class Registry implements IRegistry {
 	/**
 	 * Delegate a message to all reporters that implement IMessageReporter
 	 *
-	 * @param string $message
-	 * @param array $context
-	 *
 	 * @return void
 	 */
 	public function delegateMessage(string $message, array $context = []): void {
@@ -101,15 +85,16 @@ class Registry implements IRegistry {
 		while (($class = array_shift($this->lazyReporters)) !== null) {
 			try {
 				/** @var IReporter $reporter */
-				$reporter = $this->serverContainer->query($class);
+				$reporter = Server::get($class);
 			} catch (QueryException $e) {
 				/*
 				 * There is a circular dependency between the logger and the registry, so
 				 * we can not inject it. Thus the static call.
 				 */
-				\OC::$server->get(LoggerInterface::class)->critical('Could not load lazy crash reporter: ' . $e->getMessage(), [
+				Server::get(LoggerInterface::class)->critical('Could not load lazy crash reporter: ' . $e->getMessage(), [
 					'exception' => $e,
 				]);
+				return;
 			}
 			/**
 			 * Try to register the loaded reporter. Theoretically it could be of a wrong
@@ -122,7 +107,7 @@ class Registry implements IRegistry {
 				 * There is a circular dependency between the logger and the registry, so
 				 * we can not inject it. Thus the static call.
 				 */
-				\OC::$server->get(LoggerInterface::class)->critical('Could not register lazy crash reporter: ' . $e->getMessage(), [
+				Server::get(LoggerInterface::class)->critical('Could not register lazy crash reporter: ' . $e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
diff --git a/lib/private/Support/Subscription/Registry.php b/lib/private/Support/Subscription/Registry.php
index 3d3daa97abb..34f24d1d026 100644
--- a/lib/private/Support/Subscription/Registry.php
+++ b/lib/private/Support/Subscription/Registry.php
@@ -8,7 +8,6 @@ declare(strict_types=1);
  */
 namespace OC\Support\Subscription;
 
-use OC\User\Backend;
 use OCP\AppFramework\QueryException;
 use OCP\IConfig;
 use OCP\IGroupManager;
@@ -19,8 +18,6 @@ use OCP\Support\Subscription\Exception\AlreadyRegisteredException;
 use OCP\Support\Subscription\IRegistry;
 use OCP\Support\Subscription\ISubscription;
 use OCP\Support\Subscription\ISupportedApps;
-use OCP\User\Backend\ICountMappedUsersBackend;
-use OCP\User\Backend\ICountUsersBackend;
 use Psr\Log\LoggerInterface;
 
 class Registry implements IRegistry {
@@ -141,8 +138,8 @@ class Registry implements IRegistry {
 	 */
 	public function delegateIsHardUserLimitReached(?IManager $notificationManager = null): bool {
 		$subscription = $this->getSubscription();
-		if ($subscription instanceof ISubscription &&
-			$subscription->hasValidSubscription()) {
+		if ($subscription instanceof ISubscription
+			&& $subscription->hasValidSubscription()) {
 			$userLimitReached = $subscription->isHardUserLimitReached();
 			if ($userLimitReached && $notificationManager instanceof IManager) {
 				$this->notifyAboutReachedUserLimit($notificationManager);
@@ -167,22 +164,8 @@ class Registry implements IRegistry {
 	}
 
 	private function getUserCount(): int {
-		$userCount = 0;
-		$backends = $this->userManager->getBackends();
-		foreach ($backends as $backend) {
-			if ($backend instanceof ICountMappedUsersBackend) {
-				$userCount += $backend->countMappedUsers();
-			} elseif ($backend->implementsActions(Backend::COUNT_USERS)) {
-				/** @var ICountUsersBackend $backend */
-				$backendUsers = $backend->countUsers();
-				if ($backendUsers !== false) {
-					$userCount += $backendUsers;
-				} else {
-					// TODO what if the user count can't be determined?
-					$this->logger->warning('Can not determine user count for ' . get_class($backend), ['app' => 'lib']);
-				}
-			}
-		}
+		/* We cannot limit because we substract disabled users afterward. But we limit to mapped users so should be not too expensive. */
+		$userCount = (int)$this->userManager->countUsersTotal(0, true);
 
 		$disabledUsers = $this->config->getUsersForUserValue('core', 'enabled', 'false');
 		$disabledUsersCount = count($disabledUsers);