Merge pull request #22149 from owncloud/scrutinizer-patch-1

Scrutinizer Auto-Fixes

7 files changed, 13 insertions, 11 deletions

diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php
index 495ccb902d6..bcabb6fe57a 100644
--- a/lib/private/db/mdb2schemamanager.php
+++ b/lib/private/db/mdb2schemamanager.php
@@ -49,7 +49,6 @@ class MDB2SchemaManager {
 	/**
 	 * saves database scheme to xml file
 	 * @param string $file name of file
-	 * @param int|string $mode
 	 * @return bool
 	 *
 	 * TODO: write more documentation
@@ -123,7 +122,7 @@ class MDB2SchemaManager {
 	/**
 	 * update the database scheme
 	 * @param string $file file to read structure from
-	 * @return string|boolean
+	 * @return boolean
 	 */
 	public function simulateUpdateDbFromStructure($file) {
 		$toSchema = $this->readSchemaFromFile($file);
diff --git a/lib/private/diagnostics/querylogger.php b/lib/private/diagnostics/querylogger.php
index 794e7a5e263..66a65b71d04 100644
--- a/lib/private/diagnostics/querylogger.php
+++ b/lib/private/diagnostics/querylogger.php
@@ -53,7 +53,7 @@ class QueryLogger implements IQueryLogger {
 	}
 
 	/**
-	 * @return \OCP\Diagnostics\IQuery[]
+	 * @return Query[]
 	 */
 	public function getQueries() {
 		return $this->queries;
diff --git a/lib/private/files.php b/lib/private/files.php
index 7b451ac19be..a18bcc76519 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -160,6 +160,8 @@ class OC_Files {
 	/**
 	 * @param View $view
 	 * @param string $name
+	 * @param string $dir
+	 * @param boolean $onlyHeader
 	 */
 	private static function getSingleFile($view, $dir, $name, $onlyHeader) {
 		$filename = $dir . '/' . $name;
@@ -185,7 +187,7 @@ class OC_Files {
 
 	/**
 	 * @param View $view
-	 * @param $dir
+	 * @param string $dir
 	 * @param string[]|string $files
 	 */
 	public static function lockFiles($view, $dir, $files) {
@@ -290,11 +292,11 @@ class OC_Files {
 	}
 
 	/**
-	 * @param $dir
+	 * @param string $dir
 	 * @param $files
-	 * @param $getType
+	 * @param integer $getType
 	 * @param View $view
-	 * @param $filename
+	 * @param string $filename
 	 */
 	private static function unlockAllTheFiles($dir, $files, $getType, $view, $filename) {
 		if ($getType === self::FILE) {
diff --git a/lib/private/files/node/root.php b/lib/private/files/node/root.php
index 35163be0a0d..40ed531d5df 100644
--- a/lib/private/files/node/root.php
+++ b/lib/private/files/node/root.php
@@ -169,7 +169,7 @@ class Root extends Folder implements IRootFolder {
 	 * @param string $path
 	 * @throws \OCP\Files\NotFoundException
 	 * @throws \OCP\Files\NotPermittedException
-	 * @return \OCP\Files\Node
+	 * @return string
 	 */
 	public function get($path) {
 		$path = $this->normalizePath($path);
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
index 95bb3f74ba7..7d8d9ebd25e 100644
--- a/lib/private/files/storage/common.php
+++ b/lib/private/files/storage/common.php
@@ -396,7 +396,7 @@ abstract class Common implements Storage, ILockingStorage {
 	 * get the ETag for a file or folder
 	 *
 	 * @param string $path
-	 * @return string|false
+	 * @return string
 	 */
 	public function getETag($path) {
 		return uniqid();
diff --git a/lib/private/files/stream/dir.php b/lib/private/files/stream/dir.php
index fabadb0d596..7489ee683a2 100644
--- a/lib/private/files/stream/dir.php
+++ b/lib/private/files/stream/dir.php
@@ -58,6 +58,7 @@ class Dir {
 
 	/**
 	 * @param string $path
+	 * @param string[] $content
 	 */
 	public static function register($path, $content) {
 		self::$dirs[$path] = $content;
diff --git a/lib/private/files/type/detection.php b/lib/private/files/type/detection.php
index 9cc2e97c3cc..f106a98064f 100644
--- a/lib/private/files/type/detection.php
+++ b/lib/private/files/type/detection.php
@@ -121,7 +121,7 @@ class Detection implements IMimeTypeDetector {
 	}
 
 	/**
-	 * @return array
+	 * @return string[]
 	 */
 	public function getAllAliases() {
 		$this->loadAliases();
@@ -264,7 +264,7 @@ class Detection implements IMimeTypeDetector {
 
 	/**
 	 * Get path to the icon of a file type
-	 * @param string $mimeType the MIME type
+	 * @param string $mimetype the MIME type
 	 * @return string the url
 	 */
 	public function mimeTypeIcon($mimetype) {