nextcloud / server

apps/settings/lib/AppInfo/Application.php

Indentation +156 added lines, -156 removed lines

@@ -95,160 +95,160 @@
 use OCP\Util;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'settings';
-
-	/**
-	 * @param array $urlParams
-	 */
-	public function __construct(array $urlParams = []) {
-		parent::__construct(self::APP_ID, $urlParams);
-	}
-
-	public function register(IRegistrationContext $context): void {
-		// Register Middleware
-		$context->registerServiceAlias('SubadminMiddleware', SubadminMiddleware::class);
-		$context->registerMiddleware(SubadminMiddleware::class);
-		$context->registerSearchProvider(SectionSearch::class);
-		$context->registerSearchProvider(AppSearch::class);
-		$context->registerSearchProvider(UserSearch::class);
-
-		// Register listeners
-		$context->registerEventListener(AppPasswordCreatedEvent::class, AppPasswordCreatedActivityListener::class);
-		$context->registerEventListener(UserAddedEvent::class, UserAddedToGroupActivityListener::class);
-		$context->registerEventListener(UserRemovedEvent::class, UserRemovedFromGroupActivityListener::class);
-		$context->registerEventListener(GroupDeletedEvent::class, GroupRemovedListener::class);
-
-		// Register Mail Provider listeners
-		$context->registerEventListener(DeclarativeSettingsGetValueEvent::class, MailProviderListener::class);
-		$context->registerEventListener(DeclarativeSettingsSetValueEvent::class, MailProviderListener::class);
-
-		// Register well-known handlers
-		$context->registerWellKnownHandler(SecurityTxtHandler::class);
-		$context->registerWellKnownHandler(ChangePasswordHandler::class);
-
-		// Register Settings Form(s)
-		$context->registerDeclarativeSettings(MailProvider::class);
-
-		/**
-		 * Core class wrappers
-		 */
-		$context->registerService(IProvider::class, function (IAppContainer $appContainer) {
-			/** @var IServerContainer $serverContainer */
-			$serverContainer = $appContainer->query(IServerContainer::class);
-			return $serverContainer->query(IProvider::class);
-		});
-		$context->registerService(IManager::class, function (IAppContainer $appContainer) {
-			/** @var IServerContainer $serverContainer */
-			$serverContainer = $appContainer->query(IServerContainer::class);
-			return $serverContainer->getSettingsManager();
-		});
-
-		$context->registerService(NewUserMailHelper::class, function (IAppContainer $appContainer) {
-			/** @var Server $server */
-			$server = $appContainer->query(IServerContainer::class);
-			/** @var Defaults $defaults */
-			$defaults = $server->query(Defaults::class);
-
-			return new NewUserMailHelper(
-				$defaults,
-				$server->getURLGenerator(),
-				$server->getL10NFactory(),
-				$server->getMailer(),
-				$server->getSecureRandom(),
-				new TimeFactory(),
-				$server->getConfig(),
-				$server->getCrypto(),
-				Util::getDefaultEmailAddress('no-reply')
-			);
-		});
-		$context->registerSetupCheck(AllowedAdminRanges::class);
-		$context->registerSetupCheck(AppDirsWithDifferentOwner::class);
-		$context->registerSetupCheck(BruteForceThrottler::class);
-		$context->registerSetupCheck(CheckUserCertificates::class);
-		$context->registerSetupCheck(CodeIntegrity::class);
-		$context->registerSetupCheck(CronErrors::class);
-		$context->registerSetupCheck(CronInfo::class);
-		$context->registerSetupCheck(DatabaseHasMissingColumns::class);
-		$context->registerSetupCheck(DatabaseHasMissingIndices::class);
-		$context->registerSetupCheck(DatabaseHasMissingPrimaryKeys::class);
-		$context->registerSetupCheck(DatabasePendingBigIntConversions::class);
-		$context->registerSetupCheck(DataDirectoryProtected::class);
-		$context->registerSetupCheck(DebugMode::class);
-		$context->registerSetupCheck(DefaultPhoneRegionSet::class);
-		$context->registerSetupCheck(EmailTestSuccessful::class);
-		$context->registerSetupCheck(FileLocking::class);
-		$context->registerSetupCheck(ForwardedForHeaders::class);
-		$context->registerSetupCheck(HttpsUrlGeneration::class);
-		$context->registerSetupCheck(InternetConnectivity::class);
-		$context->registerSetupCheck(JavaScriptSourceMaps::class);
-		$context->registerSetupCheck(JavaScriptModules::class);
-		$context->registerSetupCheck(LegacySSEKeyFormat::class);
-		$context->registerSetupCheck(MaintenanceWindowStart::class);
-		$context->registerSetupCheck(MemcacheConfigured::class);
-		$context->registerSetupCheck(MimeTypeMigrationAvailable::class);
-		$context->registerSetupCheck(MysqlRowFormat::class);
-		$context->registerSetupCheck(MysqlUnicodeSupport::class);
-		$context->registerSetupCheck(OcxProviders::class);
-		$context->registerSetupCheck(OverwriteCliUrl::class);
-		$context->registerSetupCheck(PhpDefaultCharset::class);
-		$context->registerSetupCheck(PhpDisabledFunctions::class);
-		$context->registerSetupCheck(PhpFreetypeSupport::class);
-		$context->registerSetupCheck(PhpApcuConfig::class);
-		$context->registerSetupCheck(PhpGetEnv::class);
-		// Temporarily disabled $context->registerSetupCheck(PhpMaxFileSize::class);
-		$context->registerSetupCheck(PhpMemoryLimit::class);
-		$context->registerSetupCheck(PhpModules::class);
-		$context->registerSetupCheck(PhpOpcacheSetup::class);
-		$context->registerSetupCheck(PhpOutdated::class);
-		$context->registerSetupCheck(PhpOutputBuffering::class);
-		$context->registerSetupCheck(RandomnessSecure::class);
-		$context->registerSetupCheck(ReadOnlyConfig::class);
-		$context->registerSetupCheck(SecurityHeaders::class);
-		$context->registerSetupCheck(SchedulingTableSize::class);
-		$context->registerSetupCheck(SupportedDatabase::class);
-		$context->registerSetupCheck(SystemIs64bit::class);
-		$context->registerSetupCheck(TaskProcessingPickupSpeed::class);
-		$context->registerSetupCheck(TempSpaceAvailable::class);
-		$context->registerSetupCheck(TransactionIsolation::class);
-		$context->registerSetupCheck(PushService::class);
-		$context->registerSetupCheck(WellKnownUrls::class);
-		$context->registerSetupCheck(Woff2Loading::class);
-
-		$context->registerUserMigrator(AccountMigrator::class);
-	}
-
-	public function boot(IBootContext $context): void {
-		Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
-		Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
-	}
-
-	/**
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 * @throws \Exception
-	 * @throws QueryException
-	 */
-	public function onChangePassword(array $parameters) {
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->onChangePassword($parameters['uid']);
-	}
-
-	/**
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 * @throws \Exception
-	 * @throws QueryException
-	 */
-	public function onChangeInfo(array $parameters) {
-		if ($parameters['feature'] !== 'eMailAddress') {
-			return;
-		}
-
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->onChangeEmail($parameters['user'], $parameters['old_value']);
-	}
+    public const APP_ID = 'settings';
+
+    /**
+     * @param array $urlParams
+     */
+    public function __construct(array $urlParams = []) {
+        parent::__construct(self::APP_ID, $urlParams);
+    }
+
+    public function register(IRegistrationContext $context): void {
+        // Register Middleware
+        $context->registerServiceAlias('SubadminMiddleware', SubadminMiddleware::class);
+        $context->registerMiddleware(SubadminMiddleware::class);
+        $context->registerSearchProvider(SectionSearch::class);
+        $context->registerSearchProvider(AppSearch::class);
+        $context->registerSearchProvider(UserSearch::class);
+
+        // Register listeners
+        $context->registerEventListener(AppPasswordCreatedEvent::class, AppPasswordCreatedActivityListener::class);
+        $context->registerEventListener(UserAddedEvent::class, UserAddedToGroupActivityListener::class);
+        $context->registerEventListener(UserRemovedEvent::class, UserRemovedFromGroupActivityListener::class);
+        $context->registerEventListener(GroupDeletedEvent::class, GroupRemovedListener::class);
+
+        // Register Mail Provider listeners
+        $context->registerEventListener(DeclarativeSettingsGetValueEvent::class, MailProviderListener::class);
+        $context->registerEventListener(DeclarativeSettingsSetValueEvent::class, MailProviderListener::class);
+
+        // Register well-known handlers
+        $context->registerWellKnownHandler(SecurityTxtHandler::class);
+        $context->registerWellKnownHandler(ChangePasswordHandler::class);
+
+        // Register Settings Form(s)
+        $context->registerDeclarativeSettings(MailProvider::class);
+
+        /**
+         * Core class wrappers
+         */
+        $context->registerService(IProvider::class, function (IAppContainer $appContainer) {
+            /** @var IServerContainer $serverContainer */
+            $serverContainer = $appContainer->query(IServerContainer::class);
+            return $serverContainer->query(IProvider::class);
+        });
+        $context->registerService(IManager::class, function (IAppContainer $appContainer) {
+            /** @var IServerContainer $serverContainer */
+            $serverContainer = $appContainer->query(IServerContainer::class);
+            return $serverContainer->getSettingsManager();
+        });
+
+        $context->registerService(NewUserMailHelper::class, function (IAppContainer $appContainer) {
+            /** @var Server $server */
+            $server = $appContainer->query(IServerContainer::class);
+            /** @var Defaults $defaults */
+            $defaults = $server->query(Defaults::class);
+
+            return new NewUserMailHelper(
+                $defaults,
+                $server->getURLGenerator(),
+                $server->getL10NFactory(),
+                $server->getMailer(),
+                $server->getSecureRandom(),
+                new TimeFactory(),
+                $server->getConfig(),
+                $server->getCrypto(),
+                Util::getDefaultEmailAddress('no-reply')
+            );
+        });
+        $context->registerSetupCheck(AllowedAdminRanges::class);
+        $context->registerSetupCheck(AppDirsWithDifferentOwner::class);
+        $context->registerSetupCheck(BruteForceThrottler::class);
+        $context->registerSetupCheck(CheckUserCertificates::class);
+        $context->registerSetupCheck(CodeIntegrity::class);
+        $context->registerSetupCheck(CronErrors::class);
+        $context->registerSetupCheck(CronInfo::class);
+        $context->registerSetupCheck(DatabaseHasMissingColumns::class);
+        $context->registerSetupCheck(DatabaseHasMissingIndices::class);
+        $context->registerSetupCheck(DatabaseHasMissingPrimaryKeys::class);
+        $context->registerSetupCheck(DatabasePendingBigIntConversions::class);
+        $context->registerSetupCheck(DataDirectoryProtected::class);
+        $context->registerSetupCheck(DebugMode::class);
+        $context->registerSetupCheck(DefaultPhoneRegionSet::class);
+        $context->registerSetupCheck(EmailTestSuccessful::class);
+        $context->registerSetupCheck(FileLocking::class);
+        $context->registerSetupCheck(ForwardedForHeaders::class);
+        $context->registerSetupCheck(HttpsUrlGeneration::class);
+        $context->registerSetupCheck(InternetConnectivity::class);
+        $context->registerSetupCheck(JavaScriptSourceMaps::class);
+        $context->registerSetupCheck(JavaScriptModules::class);
+        $context->registerSetupCheck(LegacySSEKeyFormat::class);
+        $context->registerSetupCheck(MaintenanceWindowStart::class);
+        $context->registerSetupCheck(MemcacheConfigured::class);
+        $context->registerSetupCheck(MimeTypeMigrationAvailable::class);
+        $context->registerSetupCheck(MysqlRowFormat::class);
+        $context->registerSetupCheck(MysqlUnicodeSupport::class);
+        $context->registerSetupCheck(OcxProviders::class);
+        $context->registerSetupCheck(OverwriteCliUrl::class);
+        $context->registerSetupCheck(PhpDefaultCharset::class);
+        $context->registerSetupCheck(PhpDisabledFunctions::class);
+        $context->registerSetupCheck(PhpFreetypeSupport::class);
+        $context->registerSetupCheck(PhpApcuConfig::class);
+        $context->registerSetupCheck(PhpGetEnv::class);
+        // Temporarily disabled $context->registerSetupCheck(PhpMaxFileSize::class);
+        $context->registerSetupCheck(PhpMemoryLimit::class);
+        $context->registerSetupCheck(PhpModules::class);
+        $context->registerSetupCheck(PhpOpcacheSetup::class);
+        $context->registerSetupCheck(PhpOutdated::class);
+        $context->registerSetupCheck(PhpOutputBuffering::class);
+        $context->registerSetupCheck(RandomnessSecure::class);
+        $context->registerSetupCheck(ReadOnlyConfig::class);
+        $context->registerSetupCheck(SecurityHeaders::class);
+        $context->registerSetupCheck(SchedulingTableSize::class);
+        $context->registerSetupCheck(SupportedDatabase::class);
+        $context->registerSetupCheck(SystemIs64bit::class);
+        $context->registerSetupCheck(TaskProcessingPickupSpeed::class);
+        $context->registerSetupCheck(TempSpaceAvailable::class);
+        $context->registerSetupCheck(TransactionIsolation::class);
+        $context->registerSetupCheck(PushService::class);
+        $context->registerSetupCheck(WellKnownUrls::class);
+        $context->registerSetupCheck(Woff2Loading::class);
+
+        $context->registerUserMigrator(AccountMigrator::class);
+    }
+
+    public function boot(IBootContext $context): void {
+        Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
+        Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
+    }
+
+    /**
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \Exception
+     * @throws QueryException
+     */
+    public function onChangePassword(array $parameters) {
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->onChangePassword($parameters['uid']);
+    }
+
+    /**
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \Exception
+     * @throws QueryException
+     */
+    public function onChangeInfo(array $parameters) {
+        if ($parameters['feature'] !== 'eMailAddress') {
+            return;
+        }
+
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->onChangeEmail($parameters['user'], $parameters['old_value']);
+    }
 }

apps/settings/lib/SetupChecks/TaskProcessingPickupSpeed.php

Indentation +44 added lines, -44 removed lines

@@ -16,48 +16,48 @@
 use OCP\TaskProcessing\IManager;
 
 class TaskProcessingPickupSpeed implements ISetupCheck {
-	public const MAX_SLOW_PERCENTAGE = 0.2;
-	public const TIME_SPAN = 24;
-
-	public function __construct(
-		private IL10N $l10n,
-		private IManager $taskProcessingManager,
-		private ITimeFactory $timeFactory,
-	) {
-	}
-
-	public function getCategory(): string {
-		return 'ai';
-	}
-
-	public function getName(): string {
-		return $this->l10n->t('Task Processing pickup speed');
-	}
-
-	public function run(): SetupResult {
-		$tasks = $this->taskProcessingManager->getTasks(userId: '', scheduleAfter: $this->timeFactory->now()->getTimestamp() - 60 * 60 * self::TIME_SPAN); // userId: '' means no filter, whereas null would mean guest
-		$taskCount = count($tasks);
-		if ($taskCount === 0) {
-			return SetupResult::success($this->l10n->t('No scheduled tasks in the last {hours} hours.', ['hours' => self::TIME_SPAN]));
-		}
-		$slowCount = 0;
-		foreach ($tasks as $task) {
-			if ($task->getStartedAt() === null) {
-				continue; // task was not picked up yet
-			}
-			if ($task->getScheduledAt() === null) {
-				continue; // task was not scheduled yet -- should not happen, but the API specifies null as return value
-			}
-			$pickupDelay = $task->getScheduledAt() - $task->getStartedAt();
-			if ($pickupDelay > 60 * 4) {
-				$slowCount++; // task pickup took longer than 4 minutes
-			}
-		}
-
-		if ($slowCount / $taskCount < self::MAX_SLOW_PERCENTAGE) {
-			return SetupResult::success($this->l10n->t('Task pickup speed is ok in the last {hours} hours.', ['hours' => self::TIME_SPAN]));
-		} else {
-			return SetupResult::warning($this->l10n->t('Task pickup speed is slow in the last {hours} hours. Many tasks took longer than 4 min to get picked up. Consider setting up a worker to process tasks in the background.', ['hours' => self::TIME_SPAN]), 'https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed');
-		}
-	}
+    public const MAX_SLOW_PERCENTAGE = 0.2;
+    public const TIME_SPAN = 24;
+
+    public function __construct(
+        private IL10N $l10n,
+        private IManager $taskProcessingManager,
+        private ITimeFactory $timeFactory,
+    ) {
+    }
+
+    public function getCategory(): string {
+        return 'ai';
+    }
+
+    public function getName(): string {
+        return $this->l10n->t('Task Processing pickup speed');
+    }
+
+    public function run(): SetupResult {
+        $tasks = $this->taskProcessingManager->getTasks(userId: '', scheduleAfter: $this->timeFactory->now()->getTimestamp() - 60 * 60 * self::TIME_SPAN); // userId: '' means no filter, whereas null would mean guest
+        $taskCount = count($tasks);
+        if ($taskCount === 0) {
+            return SetupResult::success($this->l10n->t('No scheduled tasks in the last {hours} hours.', ['hours' => self::TIME_SPAN]));
+        }
+        $slowCount = 0;
+        foreach ($tasks as $task) {
+            if ($task->getStartedAt() === null) {
+                continue; // task was not picked up yet
+            }
+            if ($task->getScheduledAt() === null) {
+                continue; // task was not scheduled yet -- should not happen, but the API specifies null as return value
+            }
+            $pickupDelay = $task->getScheduledAt() - $task->getStartedAt();
+            if ($pickupDelay > 60 * 4) {
+                $slowCount++; // task pickup took longer than 4 minutes
+            }
+        }
+
+        if ($slowCount / $taskCount < self::MAX_SLOW_PERCENTAGE) {
+            return SetupResult::success($this->l10n->t('Task pickup speed is ok in the last {hours} hours.', ['hours' => self::TIME_SPAN]));
+        } else {
+            return SetupResult::warning($this->l10n->t('Task pickup speed is slow in the last {hours} hours. Many tasks took longer than 4 min to get picked up. Consider setting up a worker to process tasks in the background.', ['hours' => self::TIME_SPAN]), 'https://docs.nextcloud.com/server/latest/admin_manual/ai/overview.html#improve-ai-task-pickup-speed');
+        }
+    }
 }

apps/settings/tests/SetupChecks/TaskProcessingPickupSpeedTest.php

Indentation +45 added lines, -45 removed lines

@@ -17,57 +17,57 @@
 use Test\TestCase;
 
 class TaskProcessingPickupSpeedTest extends TestCase {
-	private IL10N $l10n;
-	private ITimeFactory $timeFactory;
-	private IManager $taskProcessingManager;
+    private IL10N $l10n;
+    private ITimeFactory $timeFactory;
+    private IManager $taskProcessingManager;
 
-	private TaskProcessingPickupSpeed $check;
+    private TaskProcessingPickupSpeed $check;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->l10n = $this->getMockBuilder(IL10N::class)->getMock();
-		$this->timeFactory = $this->getMockBuilder(ITimeFactory::class)->getMock();
-		$this->taskProcessingManager = $this->getMockBuilder(IManager::class)->getMock();
+        $this->l10n = $this->getMockBuilder(IL10N::class)->getMock();
+        $this->timeFactory = $this->getMockBuilder(ITimeFactory::class)->getMock();
+        $this->taskProcessingManager = $this->getMockBuilder(IManager::class)->getMock();
 
-		$this->check = new TaskProcessingPickupSpeed(
-			$this->l10n,
-			$this->taskProcessingManager,
-			$this->timeFactory,
-		);
-	}
+        $this->check = new TaskProcessingPickupSpeed(
+            $this->l10n,
+            $this->taskProcessingManager,
+            $this->timeFactory,
+        );
+    }
 
-	public function testPass(): void {
-		$tasks = [];
-		for ($i = 0; $i < 100; $i++) {
-			$task = new Task('test', ['test' => 'test'], 'settings', 'user' . $i);
-			$task->setStartedAt(0);
-			if ($i < 15) {
-				$task->setScheduledAt(60 * 5); // 15% get 5mins
-			} else {
-				$task->setScheduledAt(60); // the rest gets 1min
-			}
-			$tasks[] = $task;
-		}
-		$this->taskProcessingManager->method('getTasks')->willReturn($tasks);
+    public function testPass(): void {
+        $tasks = [];
+        for ($i = 0; $i < 100; $i++) {
+            $task = new Task('test', ['test' => 'test'], 'settings', 'user' . $i);
+            $task->setStartedAt(0);
+            if ($i < 15) {
+                $task->setScheduledAt(60 * 5); // 15% get 5mins
+            } else {
+                $task->setScheduledAt(60); // the rest gets 1min
+            }
+            $tasks[] = $task;
+        }
+        $this->taskProcessingManager->method('getTasks')->willReturn($tasks);
 
-		$this->assertEquals(SetupResult::SUCCESS, $this->check->run()->getSeverity());
-	}
+        $this->assertEquals(SetupResult::SUCCESS, $this->check->run()->getSeverity());
+    }
 
-	public function testFail(): void {
-		$tasks = [];
-		for ($i = 0; $i < 100; $i++) {
-			$task = new Task('test', ['test' => 'test'], 'settings', 'user' . $i);
-			$task->setStartedAt(0);
-			if ($i < 30) {
-				$task->setScheduledAt(60 * 5); // 30% get 5mins
-			} else {
-				$task->setScheduledAt(60); // the rest gets 1min
-			}
-			$tasks[] = $task;
-		}
-		$this->taskProcessingManager->method('getTasks')->willReturn($tasks);
+    public function testFail(): void {
+        $tasks = [];
+        for ($i = 0; $i < 100; $i++) {
+            $task = new Task('test', ['test' => 'test'], 'settings', 'user' . $i);
+            $task->setStartedAt(0);
+            if ($i < 30) {
+                $task->setScheduledAt(60 * 5); // 30% get 5mins
+            } else {
+                $task->setScheduledAt(60); // the rest gets 1min
+            }
+            $tasks[] = $task;
+        }
+        $this->taskProcessingManager->method('getTasks')->willReturn($tasks);
 
-		$this->assertEquals(SetupResult::WARNING, $this->check->run()->getSeverity());
-	}
+        $this->assertEquals(SetupResult::WARNING, $this->check->run()->getSeverity());
+    }
 }