diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-03-09 16:09:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-09 16:09:23 +0100 |
| commit | 5a8c7854d622b0e99a7c877aaf06807161039db2 (patch) | |
| tree | d4fcac651a3a88f17ffdf6c2c6db9053231fd806 | |
| parent | 0b6dbe6419b641871141469526965f76629853ca (diff) | |
| parent | 5fc4c91a76a266fd8e6c19fe85ca3240444d768d (diff) | |
| download | nextcloud-server-5a8c7854d622b0e99a7c877aaf06807161039db2.tar.gz nextcloud-server-5a8c7854d622b0e99a7c877aaf06807161039db2.zip | |
Merge pull request #19819 from nextcloud/fix/mismatching-docblock-param-type
Fix mismatching doc block parameter types
| -rw-r--r-- | lib/private/AppFramework/OCS/BaseResponse.php | 2 | ||||
| -rw-r--r-- | lib/private/Authentication/TwoFactorAuth/Manager.php | 2 | ||||
| -rw-r--r-- | lib/private/DB/Migrator.php | 2 | ||||
| -rw-r--r-- | lib/private/DB/MySQLMigrator.php | 2 | ||||
| -rw-r--r-- | lib/private/Preview/GeneratorHelper.php | 3 | ||||
| -rw-r--r-- | 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 */ |