From 5fc4c91a76a266fd8e6c19fe85ca3240444d768d Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Fri, 6 Mar 2020 16:28:42 +0100
Subject: [PATCH] Fix mismatching doc block parameter types
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
lib/private/AppFramework/OCS/BaseResponse.php | 2 +-
lib/private/Authentication/TwoFactorAuth/Manager.php | 2 +-
lib/private/DB/Migrator.php | 2 +-
lib/private/DB/MySQLMigrator.php | 2 +-
lib/private/Preview/GeneratorHelper.php | 3 ++-
lib/public/FullTextSearch/Model/IIndex.php | 2 +-
6 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/lib/private/AppFramework/OCS/BaseResponse.php b/lib/private/AppFramework/OCS/BaseResponse.php
index 68456289be5..c7aa5ad073b 100644
--- a/lib/private/AppFramework/OCS/BaseResponse.php
+++ b/lib/private/AppFramework/OCS/BaseResponse.php
@@ -48,7 +48,7 @@ abstract class BaseResponse extends Response {
/**
* BaseResponse constructor.
*
- * @param DataResponse|null $dataResponse
+ * @param DataResponse $dataResponse
* @param string $format
* @param string|null $statusMessage
* @param int|null $itemsCount
diff --git a/lib/private/Authentication/TwoFactorAuth/Manager.php b/lib/private/Authentication/TwoFactorAuth/Manager.php
index 7fba6d4874a..b048d4e1f3c 100644
--- a/lib/private/Authentication/TwoFactorAuth/Manager.php
+++ b/lib/private/Authentication/TwoFactorAuth/Manager.php
@@ -181,7 +181,7 @@ class Manager {
/**
* @param array $states
- * @param IProvider $providers
+ * @param IProvider[] $providers
*/
private function isProviderMissing(array $states, array $providers): bool {
$indexed = [];
diff --git a/lib/private/DB/Migrator.php b/lib/private/DB/Migrator.php
index cf4eb43bc8f..8b1621a5f55 100644
--- a/lib/private/DB/Migrator.php
+++ b/lib/private/DB/Migrator.php
@@ -62,7 +62,7 @@ class Migrator {
private $noEmit = false;
/**
- * @param \Doctrine\DBAL\Connection|Connection $connection
+ * @param \Doctrine\DBAL\Connection $connection
* @param ISecureRandom $random
* @param IConfig $config
* @param EventDispatcherInterface $dispatcher
diff --git a/lib/private/DB/MySQLMigrator.php b/lib/private/DB/MySQLMigrator.php
index 8cc537f6b75..73122fb0715 100644
--- a/lib/private/DB/MySQLMigrator.php
+++ b/lib/private/DB/MySQLMigrator.php
@@ -51,7 +51,7 @@ class MySQLMigrator extends Migrator {
return $schemaDiff;
}
-
+
/**
* Speed up migration test by disabling autocommit and unique indexes check
*
diff --git a/lib/private/Preview/GeneratorHelper.php b/lib/private/Preview/GeneratorHelper.php
index 0e271947b56..470cad2d0a6 100644
--- a/lib/private/Preview/GeneratorHelper.php
+++ b/lib/private/Preview/GeneratorHelper.php
@@ -52,10 +52,11 @@ class GeneratorHelper {
}
/**
- * @param IProvider $provider
+ * @param IProviderV2 $provider
* @param File $file
* @param int $maxWidth
* @param int $maxHeight
+ *
* @return bool|IImage
*/
public function getThumbnail(IProviderV2 $provider, File $file, $maxWidth, $maxHeight) {
diff --git a/lib/public/FullTextSearch/Model/IIndex.php b/lib/public/FullTextSearch/Model/IIndex.php
index 9d0d9e0fe71..c63ddc19906 100644
--- a/lib/public/FullTextSearch/Model/IIndex.php
+++ b/lib/public/FullTextSearch/Model/IIndex.php
@@ -181,7 +181,7 @@ interface IIndex {
* @since 15.0.0
*
* @param string $option
- * @param string|int $value
+ * @param string $value
*
* @return IIndex
*/
--
GitLab