refactor: Apply comments

Signed-off-by: Carl Schwan <[email protected]>

Author: CarlSchwan

apps/dav/lib/Connector/Sabre/TagsPlugin.php

@@ -49,11 +49,7 @@ class TagsPlugin extends \Sabre\DAV\ServerPlugin {
 	 * @var \Sabre\DAV\Server
 	 */
 	private $server;
-
-	/**
-	 * @var ITags
-	 */
-	private $tagger;
+	private ?ITags $tagger = null;
 
 	/**
 	 * Array of file id to tags array
@@ -105,12 +101,17 @@ public function initialize(\Sabre\DAV\Server $server) {
 	 *
 	 * @return ITags tagger
 	 */
-	private function getTagger() {
-		if (!$this->tagger) {
-			$this->tagger = $this->tagManager->load('files');
-			assert($this->tagger !== null);
+	private function getTagger(): ITags {
+		if ($this->tagger) {
+			return $this->tagger;
+		}
+
+		$tagger = $this->tagManager->load('files');
+		if ($tagger === null) {
+			throw new \RuntimeException('Tagger not found for files');
 		}
-		return $this->tagger;
+		$this->tagger = $tagger;
+		return $tagger;
 	}
 
 	/**

apps/federation/lib/SyncFederationAddressBooks.php

@@ -7,16 +7,16 @@
  */
 namespace OCA\Federation;
 
-use OC\OCS\DiscoveryService;
 use OCA\DAV\CardDAV\SyncService;
 use OCP\AppFramework\Http;
+use OCP\OCS\IDiscoveryService;
 use Psr\Log\LoggerInterface;
 
 class SyncFederationAddressBooks {
 	public function __construct(
 		protected DbHandler $dbHandler,
 		private SyncService $syncService,
-		private DiscoveryService $ocsDiscoveryService,
+		private IDiscoveryService $ocsDiscoveryService,
 		private LoggerInterface $logger,
 	) {
 	}

apps/settings/lib/Controller/ChangePasswordController.php

@@ -25,6 +25,7 @@
 use OCP\IRequest;
 use OCP\IUser;
 use OCP\IUserManager;
+use OCP\IUserSession;
 use OCP\Server;
 
 class ChangePasswordController extends Controller {

apps/user_ldap/lib/Access.php

@@ -1050,9 +1050,6 @@ public function countObjects(?int $limit = null, ?int $offset = null) {
 	/**
 	 * Returns the LDAP handler
 	 *
-	 * @throws \OC\ServerNotAvailableException
-	 */
-	/**
 	 * @param mixed[] $arguments
 	 * @return mixed
 	 * @throws ServerNotAvailableException

apps/user_ldap/lib/User_LDAP.php

@@ -260,8 +260,7 @@ public function getUsers($search = '', $limit = 10, $offset = 0) {
 	/**
 	 * checks whether a user is still available on LDAP
 	 *
-	 * @param string|User $user either the Nextcloud user
-	 *                          name or an instance of that user
+	 * @param string|User $user either the Nextcloud user id or an instance of that user
 	 * @throws \Exception
 	 * @throws ServerNotAvailableException
 	 */

build/psalm-baseline.xml

@@ -3473,16 +3473,16 @@
   </file>
   <file src="lib/private/Command/CommandJob.php">
     <UndefinedClass>
-      <code><![CDATA[\Test\Command\FilesystemCommand]]></code>
-      <code><![CDATA[\Test\Command\SimpleCommand]]></code>
-      <code><![CDATA[\Test\Command\StateFullCommand]]></code>
+      <code><![CDATA[FilesystemCommand]]></code>
+      <code><![CDATA[SimpleCommand]]></code>
+      <code><![CDATA[StateFullCommand]]></code>
     </UndefinedClass>
   </file>
   <file src="lib/private/Command/QueueBus.php">
     <UndefinedClass>
-      <code><![CDATA[\Test\Command\FilesystemCommand]]></code>
-      <code><![CDATA[\Test\Command\SimpleCommand]]></code>
-      <code><![CDATA[\Test\Command\StateFullCommand]]></code>
+      <code><![CDATA[FilesystemCommand]]></code>
+      <code><![CDATA[SimpleCommand]]></code>
+      <code><![CDATA[StateFullCommand]]></code>
     </UndefinedClass>
   </file>
   <file src="lib/private/Comments/Manager.php">
@@ -3593,16 +3593,6 @@
       <code><![CDATA[string]]></code>
     </InvalidReturnType>
   </file>
-  <file src="lib/private/Diagnostics/Query.php">
-    <ImplementedReturnTypeMismatch>
-      <code><![CDATA[float]]></code>
-    </ImplementedReturnTypeMismatch>
-  </file>
-  <file src="lib/private/Diagnostics/QueryLogger.php">
-    <InvalidArgument>
-      <code><![CDATA[microtime(true)]]></code>
-    </InvalidArgument>
-  </file>
   <file src="lib/private/DirectEditing/Manager.php">
     <InvalidReturnType>
       <code><![CDATA[TemplateResponse]]></code>

core/routes.php

@@ -5,7 +5,7 @@
 use OC\Route\Router;
 
 /**
- * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016-2025 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2012-2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */

lib/private/AppFramework/Bootstrap/ServiceAliasRegistration.php

@@ -13,32 +13,26 @@
  */
 class ServiceAliasRegistration extends ARegistration {
 	/**
-	 * @psalm-param string|class-string $alias
-	 * @paslm-param string|class-string $target
+	 * @param class-string $alias
+	 * @param class-string $target
 	 */
 	public function __construct(
 		string $appId,
-		/**
-		 * @psalm-var string|class-string
-		 */
-		private string $alias,
-		/**
-		 * @psalm-var string|class-string
-		 */
-		private string $target,
+		private readonly string $alias,
+		private readonly string $target,
 	) {
 		parent::__construct($appId);
 	}
 
 	/**
-	 * @psalm-return string|class-string
+	 * @return class-string
 	 */
 	public function getAlias(): string {
 		return $this->alias;
 	}
 
 	/**
-	 * @psalm-return string|class-string
+	 * @return class-string
 	 */
 	public function getTarget(): string {
 		return $this->target;

lib/private/AppFramework/Bootstrap/ServiceFactoryRegistration.php

@@ -18,11 +18,11 @@ class ServiceFactoryRegistration extends ARegistration {
 	 */
 	private $factory;
 
+	/**
+	 * @param class-string $name
+	 */
 	public function __construct(
 		string $appId,
-		/**
-		 * @psalm-var string|class-string
-		 */
 		private string $name,
 		callable $target,
 		private bool $shared,

lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php

@@ -19,7 +19,7 @@
 use OC\AppFramework\Utility\ControllerMethodReflector;
 use OC\Settings\AuthorizedGroupMapper;
 use OC\User\Session;
-use OCA\Talk\Controller\PageController;
+use OCA\Talk\Controller\PageController as TalkPageController;
 use OCP\App\AppPathNotFoundException;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Controller;
@@ -110,7 +110,7 @@ public function beforeController($controller, $methodName) {
 		$this->navigationManager->setActiveEntry($this->appName);
 
 		/** @psalm-suppress UndefinedClass */
-		if (get_class($controller) === PageController::class && $methodName === 'showCall') {
+		if (get_class($controller) === TalkPageController::class && $methodName === 'showCall') {
 			$this->navigationManager->setActiveEntry('spreed');
 		}