From d7f66c36acef9334e3c9ecf750cae5bfc2f206d8 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 17 Aug 2020 17:16:50 +0200 Subject: [PATCH] Fix "misplaced variables" warning of Psalm in PHPDoc statements Ref #21787 Signed-off-by: Morris Jobke --- .../lib/Service/GlobalStoragesService.php | 2 +- apps/files_sharing/templates/public.php | 2 +- apps/files_trashbin/templates/index.php | 2 +- apps/settings/lib/Search/AppSearch.php | 1 - apps/user_ldap/templates/renewpassword.php | 2 +- core/Command/User/ResetPassword.php | 1 - core/register_command.php | 2 +- core/templates/404.php | 6 +++--- core/templates/login.php | 2 +- core/templates/publicshareauth.php | 4 ++-- core/templates/twofactorsetupchallenge.php | 8 ++++---- core/templates/twofactorshowchallenge.php | 6 +++--- core/templates/untrustedDomain.php | 2 +- lib/private/DB/MDB2SchemaManager.php | 1 - lib/private/DB/Migrator.php | 1 - lib/private/PreviewManager.php | 1 - lib/private/Search.php | 2 +- lib/private/Server.php | 2 +- lib/private/legacy/OC_Util.php | 10 +++++----- 19 files changed, 26 insertions(+), 31 deletions(-) diff --git a/apps/files_external/lib/Service/GlobalStoragesService.php b/apps/files_external/lib/Service/GlobalStoragesService.php index 2905e08883edb..3ef6fd798d48d 100644 --- a/apps/files_external/lib/Service/GlobalStoragesService.php +++ b/apps/files_external/lib/Service/GlobalStoragesService.php @@ -167,7 +167,7 @@ protected function isApplicable(StorageConfig $config) { /** * Get all configured admin and personal mounts * - * @return array map of storage id to storage config + * @return StorageConfig[] map of storage id to storage config */ public function getStorageForAllUsers() { $mounts = $this->dbConfig->getAllMounts(); diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index bdd3e8399ead6..82544385dec94 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -1,5 +1,5 @@
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index 2bf4be54f6a1b..6d375b699f3a8 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -1,4 +1,4 @@ - +
diff --git a/apps/settings/lib/Search/AppSearch.php b/apps/settings/lib/Search/AppSearch.php index 393f63a9e81b0..849bac0f7300b 100644 --- a/apps/settings/lib/Search/AppSearch.php +++ b/apps/settings/lib/Search/AppSearch.php @@ -70,7 +70,6 @@ public function getOrder(string $route, array $routeParameters): int { * @inheritDoc */ public function search(IUser $user, ISearchQuery $query): SearchResult { - /** @var $entries */ $entries = $this->navigationManager->getAll('all'); $result = []; diff --git a/apps/user_ldap/templates/renewpassword.php b/apps/user_ldap/templates/renewpassword.php index c3ea94fbf0276..dca7a459c83ac 100644 --- a/apps/user_ldap/templates/renewpassword.php +++ b/apps/user_ldap/templates/renewpassword.php @@ -1,4 +1,4 @@ - + getArgument('user'); - /** @var $user \OCP\IUser */ $user = $this->userManager->get($username); if (is_null($user)) { $output->writeln('User does not exist'); diff --git a/core/register_command.php b/core/register_command.php index 03d458a9cbc63..412e8ba8678dc 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 85ddb4c4b17f4..10c49f34b6cc9 100644 --- a/core/templates/404.php +++ b/core/templates/404.php @@ -1,7 +1,7 @@ + diff --git a/core/templates/publicshareauth.php b/core/templates/publicshareauth.php index 22e2262229119..96c5bc891114a 100644 --- a/core/templates/publicshareauth.php +++ b/core/templates/publicshareauth.php @@ -1,6 +1,6 @@ diff --git a/core/templates/twofactorshowchallenge.php b/core/templates/twofactorshowchallenge.php index 481cea06eb05b..9be36fe13a25c 100644 --- a/core/templates/twofactorshowchallenge.php +++ b/core/templates/twofactorshowchallenge.php @@ -1,7 +1,7 @@ +

t('Access through untrusted domain')); ?>

diff --git a/lib/private/DB/MDB2SchemaManager.php b/lib/private/DB/MDB2SchemaManager.php index 145272619b4aa..7808e0c0b5121 100644 --- a/lib/private/DB/MDB2SchemaManager.php +++ b/lib/private/DB/MDB2SchemaManager.php @@ -145,7 +145,6 @@ public function removeDBStructure($file) { $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 2ea365ab294df..be3d6557e95ca 100644 --- a/lib/private/DB/Migrator.php +++ b/lib/private/DB/Migrator.php @@ -226,7 +226,6 @@ protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $conn $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 546d495b47d1d..f6f6671f08b3d 100644 --- a/lib/private/PreviewManager.php +++ b/lib/private/PreviewManager.php @@ -261,7 +261,6 @@ public function isAvailable(\OCP\Files\FileInfo $file) { continue; } - /** @var $provider IProvider */ if ($provider->isAvailable($file)) { return true; } diff --git a/lib/private/Search.php b/lib/private/Search.php index ae22a6d9f19da..9ecf34aef545d 100644 --- a/lib/private/Search.php +++ b/lib/private/Search.php @@ -36,6 +36,7 @@ * Provide an interface to all search providers */ class Search implements ISearch { + /** @var Provider[] */ private $providers = []; private $registeredProviders = []; @@ -51,7 +52,6 @@ public function searchPaged($query, array $inApps = [], $page = 1, $size = 30) { $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 12abf793828a1..a934628a047de 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -580,7 +580,7 @@ public function __construct($webRoot, \OC\Config $config) { $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 fd55962447e23..0be615a8e1d31 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -555,16 +555,16 @@ private static function loadVersion() { $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; }