Fix "misplaced variables" warning of Psalm in PHPDoc statements

Ref #21787

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

6 files changed, 7 insertions, 10 deletions

diff --git a/lib/private/DB/MDB2SchemaManager.php b/lib/private/DB/MDB2SchemaManager.php
index 145272619b4..7808e0c0b51 100644
--- a/lib/private/DB/MDB2SchemaManager.php
+++ b/lib/private/DB/MDB2SchemaManager.php
@@ -145,7 +145,6 @@ class MDB2SchemaManager {
 		$toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
 		$fromSchema = $schemaReader->loadSchemaFromFile($file, $toSchema);
 		$toSchema = clone $fromSchema;
-		/** @var $table \Doctrine\DBAL\Schema\Table */
 		foreach ($toSchema->getTables() as $table) {
 			$toSchema->dropTable($table->getName());
 		}
diff --git a/lib/private/DB/Migrator.php b/lib/private/DB/Migrator.php
index 2ea365ab294..be3d6557e95 100644
--- a/lib/private/DB/Migrator.php
+++ b/lib/private/DB/Migrator.php
@@ -226,7 +226,6 @@ class Migrator {
 		$sourceSchema = $connection->getSchemaManager()->createSchema();
 
 		// remove tables we don't know about
-		/** @var $table \Doctrine\DBAL\Schema\Table */
 		foreach ($sourceSchema->getTables() as $table) {
 			if (!$targetSchema->hasTable($table->getName())) {
 				$sourceSchema->dropTable($table->getName());
diff --git a/lib/private/PreviewManager.php b/lib/private/PreviewManager.php
index 546d495b47d..f6f6671f08b 100644
--- a/lib/private/PreviewManager.php
+++ b/lib/private/PreviewManager.php
@@ -261,7 +261,6 @@ class PreviewManager implements IPreview {
 						continue;
 					}
 
-					/** @var $provider IProvider */
 					if ($provider->isAvailable($file)) {
 						return true;
 					}
diff --git a/lib/private/Search.php b/lib/private/Search.php
index ae22a6d9f19..9ecf34aef54 100644
--- a/lib/private/Search.php
+++ b/lib/private/Search.php
@@ -36,6 +36,7 @@ use OCP\Search\Provider;
  * Provide an interface to all search providers
  */
 class Search implements ISearch {
+	/** @var Provider[] */
 	private $providers = [];
 	private $registeredProviders = [];
 
@@ -51,7 +52,6 @@ class Search implements ISearch {
 		$this->initProviders();
 		$results = [];
 		foreach ($this->providers as $provider) {
-			/** @var $provider Provider */
 			if (! $provider->providesResultsFor($inApps)) {
 				continue;
 			}
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 12abf793828..a934628a047 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -580,7 +580,7 @@ class Server extends ServerContainer implements IServerContainer {
 				$dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
 			});
 			$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
-				/** @var $user \OC\User\User */
+				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
 
 				/** @var IEventDispatcher $dispatcher */
diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php
index fd55962447e..0be615a8e1d 100644
--- a/lib/private/legacy/OC_Util.php
+++ b/lib/private/legacy/OC_Util.php
@@ -555,16 +555,16 @@ class OC_Util {
 
 		$timestamp = filemtime(OC::$SERVERROOT . '/version.php');
 		require OC::$SERVERROOT . '/version.php';
-		/** @var $timestamp int */
+		/** @var int $timestamp */
 		self::$versionCache['OC_Version_Timestamp'] = $timestamp;
-		/** @var $OC_Version string */
+		/** @var string $OC_Version */
 		self::$versionCache['OC_Version'] = $OC_Version;
-		/** @var $OC_VersionString string */
+		/** @var string $OC_VersionString */
 		self::$versionCache['OC_VersionString'] = $OC_VersionString;
-		/** @var $OC_Build string */
+		/** @var string $OC_Build */
 		self::$versionCache['OC_Build'] = $OC_Build;
 
-		/** @var $OC_Channel string */
+		/** @var string $OC_Channel */
 		self::$versionCache['OC_Channel'] = $OC_Channel;
 	}