Fix "misplaced variables" warning of Psalm in PHPDoc statements

Ref #21787

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

8 files changed, 15 insertions, 16 deletions

diff --git a/core/Command/User/ResetPassword.php b/core/Command/User/ResetPassword.php
index bcb3c774ef0..bde82fd4770 100644
--- a/core/Command/User/ResetPassword.php
+++ b/core/Command/User/ResetPassword.php
@@ -70,7 +70,6 @@ class ResetPassword extends Command {
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$username = $input->getArgument('user');
 
-		/** @var $user \OCP\IUser */
 		$user = $this->userManager->get($username);
 		if (is_null($user)) {
 			$output->writeln('<error>User does not exist</error>');
diff --git a/core/register_command.php b/core/register_command.php
index 03d458a9cbc..412e8ba8678 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -42,7 +42,7 @@
  *
  */
 
-/** @var $application Symfony\Component\Console\Application */
+/** @var Symfony\Component\Console\Application $application */
 $application->add(new \Stecman\Component\Symfony\Console\BashCompletion\CompletionCommand());
 $application->add(new OC\Core\Command\Status);
 $application->add(new OC\Core\Command\Check(\OC::$server->getSystemConfig()));
diff --git a/core/templates/404.php b/core/templates/404.php
index 85ddb4c4b17..10c49f34b6c 100644
--- a/core/templates/404.php
+++ b/core/templates/404.php
@@ -1,7 +1,7 @@
 <?php
-/** @var $_ array */
-/** @var $l \OCP\IL10N */
-/** @var $theme OCP\Defaults */
+/** @var array $_ */
+/** @var \OCP\IL10N $l */
+/** @var \OCP\Defaults $theme */
 // @codeCoverageIgnoreStart
 if (!isset($_)) {//standalone  page is not supported anymore - redirect to /
 	require_once '../../lib/base.php';
diff --git a/core/templates/login.php b/core/templates/login.php
index 124a62f0646..4dc5e41f917 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,4 +1,4 @@
-<?php /** @var $l \OCP\IL10N */ ?>
+<?php /** @var \OCP\IL10N $l */ ?>
 <?php
 script('core', 'dist/login');
 ?>
diff --git a/core/templates/publicshareauth.php b/core/templates/publicshareauth.php
index 22e22622291..96c5bc89111 100644
--- a/core/templates/publicshareauth.php
+++ b/core/templates/publicshareauth.php
@@ -1,6 +1,6 @@
 <?php
-	/** @var $_ array */
-	/** @var $l \OCP\IL10N */
+	/** @var array $_ */
+	/** @var \OCP\IL10N $l */
 	style('core', 'guest');
 	style('core', 'publicshareauth');
 	script('core', 'publicshareauth');
diff --git a/core/templates/twofactorsetupchallenge.php b/core/templates/twofactorsetupchallenge.php
index a5b8b44f049..ea6a1e62f6e 100644
--- a/core/templates/twofactorsetupchallenge.php
+++ b/core/templates/twofactorsetupchallenge.php
@@ -1,9 +1,9 @@
 <?php
-/** @var $l \OCP\IL10N */
-/** @var $_ array */
-/* @var $provider OCP\Authentication\TwoFactorAuth\IProvider */
+/** @var \OCP\IL10N $l */
+/** @var array $_ */
+/** @var \OCP\Authentication\TwoFactorAuth\IProvider $provider */
 $provider = $_['provider'];
-/* @var $template string */
+/* @var string $template */
 $template = $_['template'];
 ?>
 
diff --git a/core/templates/twofactorshowchallenge.php b/core/templates/twofactorshowchallenge.php
index 481cea06eb0..9be36fe13a2 100644
--- a/core/templates/twofactorshowchallenge.php
+++ b/core/templates/twofactorshowchallenge.php
@@ -1,7 +1,7 @@
 <?php
-/** @var $l \OCP\IL10N */
-/** @var $_ array */
-/* @var $error boolean */
+/** @var \OCP\IL10N $l */
+/** @var array $_*/
+/** @var boolean $error */
 $error = $_['error'];
 /* @var $error_message string */
 $error_message = $_['error_message'];
diff --git a/core/templates/untrustedDomain.php b/core/templates/untrustedDomain.php
index 7de4ff78f30..75054106ab2 100644
--- a/core/templates/untrustedDomain.php
+++ b/core/templates/untrustedDomain.php
@@ -1,4 +1,4 @@
-<?php /** @var $_ array */ ?>
+<?php /** @var array $_ */ ?>
 
 <div class="error">
 	<h2><?php p($l->t('Access through untrusted domain')); ?></h2>