summaryrefslogtreecommitdiffstats
path: root/lib/private/files
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2014-02-19 11:51:04 +0100
committerMorris Jobke <morris.jobke@gmail.com>2014-02-19 11:51:04 +0100
commitbcad6e641a238cc3cfc202d587242b9c3bb45d8b (patch)
treeac797a0f84f6bd5e31974608c5d16113b8297f54 /lib/private/files
parent2d5ab1a5c4ff594994b8e1a50888bf0150aba431 (diff)
parentf944707a15b4819f7a67263e26b41fe4abe942ab (diff)
downloadnextcloud-server-bcad6e641a238cc3cfc202d587242b9c3bb45d8b.tar.gz
nextcloud-server-bcad6e641a238cc3cfc202d587242b9c3bb45d8b.zip
Merge pull request #7274 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
Diffstat (limited to 'lib/private/files')
-rw-r--r--lib/private/files/cache/updater.php2
-rw-r--r--lib/private/files/fileinfo.php4
-rw-r--r--lib/private/files/filesystem.php3
-rw-r--r--lib/private/files/node/folder.php1
-rw-r--r--lib/private/files/node/node.php2
-rw-r--r--lib/private/files/node/root.php1
-rw-r--r--lib/private/files/storage/loader.php3
-rw-r--r--lib/private/files/storage/mappedlocal.php6
-rw-r--r--lib/private/files/utils/scanner.php3
9 files changed, 19 insertions, 6 deletions
diff --git a/lib/private/files/cache/updater.php b/lib/private/files/cache/updater.php
index e4114e572fe..7a45b9e9e96 100644
--- a/lib/private/files/cache/updater.php
+++ b/lib/private/files/cache/updater.php
@@ -8,8 +8,6 @@
namespace OC\Files\Cache;
-use OCP\Util;
-
/**
* listen to filesystem hooks and change the cache accordingly
*/
diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php
index c77571cd2a7..2dbdd80a26b 100644
--- a/lib/private/files/fileinfo.php
+++ b/lib/private/files/fileinfo.php
@@ -29,6 +29,10 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
*/
private $internalPath;
+ /**
+ * @param string|boolean $path
+ * @param Storage\Storage $storage
+ */
public function __construct($path, $storage, $internalPath, $data) {
$this->path = $path;
$this->storage = $storage;
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index ac9d1eac783..b6102f5c245 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -668,6 +668,9 @@ class Filesystem {
return self::$defaultInstance->search($query);
}
+ /**
+ * @param string $query
+ */
static public function searchByMime($query) {
return self::$defaultInstance->searchByMime($query);
}
diff --git a/lib/private/files/node/folder.php b/lib/private/files/node/folder.php
index 923f53821b2..d9e0ddc2d61 100644
--- a/lib/private/files/node/folder.php
+++ b/lib/private/files/node/folder.php
@@ -9,7 +9,6 @@
namespace OC\Files\Node;
use OC\Files\Cache\Cache;
-use OC\Files\Cache\Scanner;
use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
diff --git a/lib/private/files/node/node.php b/lib/private/files/node/node.php
index 643a587dfc2..bc075911749 100644
--- a/lib/private/files/node/node.php
+++ b/lib/private/files/node/node.php
@@ -8,8 +8,6 @@
namespace OC\Files\Node;
-use OC\Files\Cache\Cache;
-use OC\Files\Cache\Scanner;
use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
diff --git a/lib/private/files/node/root.php b/lib/private/files/node/root.php
index a22a2aaf4e9..70135285b0d 100644
--- a/lib/private/files/node/root.php
+++ b/lib/private/files/node/root.php
@@ -9,7 +9,6 @@
namespace OC\Files\Node;
use OC\Files\Cache\Cache;
-use OC\Files\Cache\Scanner;
use OC\Files\Mount\Manager;
use OC\Files\Mount\Mount;
use OCP\Files\NotFoundException;
diff --git a/lib/private/files/storage/loader.php b/lib/private/files/storage/loader.php
index 734131261c8..966234cb04d 100644
--- a/lib/private/files/storage/loader.php
+++ b/lib/private/files/storage/loader.php
@@ -33,6 +33,9 @@ class Loader {
return $this->wrap($mountPoint, new $class($arguments));
}
+ /**
+ * @param string|boolean $mountPoint
+ */
public function wrap($mountPoint, $storage) {
foreach ($this->storageWrappers as $wrapper) {
$storage = $wrapper($mountPoint, $storage);
diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index c8b22cfb39f..1bab3489a28 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -326,12 +326,18 @@ class MappedLocal extends \OC\Files\Storage\Common{
return $this->filemtime($path)>$time;
}
+ /**
+ * @param string $path
+ */
private function buildPath($path, $create=true) {
$path = $this->stripLeading($path);
$fullPath = $this->datadir.$path;
return $this->mapper->logicToPhysical($fullPath, $create);
}
+ /**
+ * @param string $path
+ */
private function cleanMapper($path, $isLogicPath=true, $recursive=true) {
$fullPath = $path;
if ($isLogicPath) {
diff --git a/lib/private/files/utils/scanner.php b/lib/private/files/utils/scanner.php
index 558bc60cf06..a802a8fcb8b 100644
--- a/lib/private/files/utils/scanner.php
+++ b/lib/private/files/utils/scanner.php
@@ -69,6 +69,9 @@ class Scanner extends PublicEmitter {
});
}
+ /**
+ * @param string $dir
+ */
public function backgroundScan($dir) {
$mounts = $this->getMounts($dir);
foreach ($mounts as $mount) {