diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2015-05-22 09:47:59 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2015-05-22 09:47:59 +0200 |
commit | d7b2bc9e2faa29cb7862e4d9aa2ffa98846f7298 (patch) | |
tree | b938f1e869f79c9205ae96b453baa0ca08a8d538 /lib | |
parent | 156881efce0ecd18c7470a6b485de7e9cf7d4a3b (diff) | |
parent | 3d8ea96e5576bf1d42a0910f111967937415b7f4 (diff) | |
download | nextcloud-server-d7b2bc9e2faa29cb7862e4d9aa2ffa98846f7298.tar.gz nextcloud-server-d7b2bc9e2faa29cb7862e4d9aa2ffa98846f7298.zip |
Merge pull request #16516 from owncloud/fix-phpdoc-trait
Fix PHPDoc
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/files/storage/common.php | 2 | ||||
-rw-r--r-- | lib/private/files/storage/local.php | 2 | ||||
-rw-r--r-- | lib/private/files/storage/localtempfiletrait.php | 10 | ||||
-rw-r--r-- | lib/private/files/storage/mappedlocal.php | 2 | ||||
-rw-r--r-- | lib/private/files/storage/wrapper/encryption.php | 4 |
5 files changed, 16 insertions, 4 deletions
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php index 893e4ea7d9b..1257a14dd04 100644 --- a/lib/private/files/storage/common.php +++ b/lib/private/files/storage/common.php @@ -274,6 +274,8 @@ abstract class Common implements Storage { /** * @param string $query + * @param string $dir + * @return array */ protected function searchInDir($query, $dir = '') { $files = array(); diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php index 175b33b0329..315a8e7e25d 100644 --- a/lib/private/files/storage/local.php +++ b/lib/private/files/storage/local.php @@ -282,6 +282,8 @@ if (\OC_Util::runningOnWindows()) { /** * @param string $query + * @param string $dir + * @return array */ protected function searchInDir($query, $dir = '') { $files = array(); diff --git a/lib/private/files/storage/localtempfiletrait.php b/lib/private/files/storage/localtempfiletrait.php index 7dc9b777ea1..e7f51a1807f 100644 --- a/lib/private/files/storage/localtempfiletrait.php +++ b/lib/private/files/storage/localtempfiletrait.php @@ -34,13 +34,12 @@ namespace OC\Files\Storage; */ trait LocalTempFileTrait { - /** - * @var string[] - */ - protected $cachedFiles = array(); + /** @var string[] */ + protected $cachedFiles = []; /** * @param string $path + * @return string */ protected function getCachedFile($path) { if (!isset($this->cachedFiles[$path])) { @@ -49,6 +48,9 @@ trait LocalTempFileTrait { return $this->cachedFiles[$path]; } + /** + * @param string $path + */ protected function removeCachedFile($path) { unset($this->cachedFiles[$path]); } diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php index 3a3123dc4b4..4b527357254 100644 --- a/lib/private/files/storage/mappedlocal.php +++ b/lib/private/files/storage/mappedlocal.php @@ -342,6 +342,8 @@ class MappedLocal extends \OC\Files\Storage\Common { /** * @param string $query + * @param string $dir + * @return array */ protected function searchInDir($query, $dir = '') { $files = array(); diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php index 5d146b2dd1d..624b332f363 100644 --- a/lib/private/files/storage/wrapper/encryption.php +++ b/lib/private/files/storage/wrapper/encryption.php @@ -609,6 +609,10 @@ class Encryption extends Wrapper { return $encryptionModule; } + /** + * @param string $path + * @param int $unencryptedSize + */ public function updateUnencryptedSize($path, $unencryptedSize) { $this->unencryptedSize[$path] = $unencryptedSize; } |