summaryrefslogtreecommitdiffstats
path: root/lib/private/files
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/files')
-rw-r--r--lib/private/files/cache/cache.php4
-rw-r--r--lib/private/files/cache/watcher.php2
-rw-r--r--lib/private/files/fileinfo.php2
-rw-r--r--lib/private/files/mount/mount.php2
-rw-r--r--lib/private/files/type/templatemanager.php2
-rw-r--r--lib/private/files/view.php4
6 files changed, 8 insertions, 8 deletions
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index e857d451881..6aab2173da7 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -109,7 +109,7 @@ class Cache {
* get the stored metadata of a file or folder
*
* @param string/int $file
- * @return array | false
+ * @return array|false
*/
public function get($file) {
if (is_string($file) or $file == '') {
@@ -597,7 +597,7 @@ class Cache {
* get the path of a file on this storage by it's id
*
* @param int $id
- * @return string | null
+ * @return string|null
*/
public function getPathById($id) {
$sql = 'SELECT `path` FROM `*PREFIX*filecache` WHERE `fileid` = ? AND `storage` = ?';
diff --git a/lib/private/files/cache/watcher.php b/lib/private/files/cache/watcher.php
index 48aa6f853ce..599752a6eff 100644
--- a/lib/private/files/cache/watcher.php
+++ b/lib/private/files/cache/watcher.php
@@ -55,7 +55,7 @@ class Watcher {
* check $path for updates
*
* @param string $path
- * @return boolean | array true if path was updated, otherwise the cached data is returned
+ * @return boolean|array true if path was updated, otherwise the cached data is returned
*/
public function checkUpdate($path) {
if ($this->watchPolicy === self::CHECK_ALWAYS or ($this->watchPolicy === self::CHECK_ONCE and array_search($path, $this->checkedPaths) === false)) {
diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php
index d6940f50bf1..b64c5d4e112 100644
--- a/lib/private/files/fileinfo.php
+++ b/lib/private/files/fileinfo.php
@@ -147,7 +147,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
}
/**
- * @return \OCP\Files\FileInfo::TYPE_FILE | \OCP\Files\FileInfo::TYPE_FOLDER
+ * @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
*/
public function getType() {
if (isset($this->data['type'])) {
diff --git a/lib/private/files/mount/mount.php b/lib/private/files/mount/mount.php
index 08d5ddf348b..256630726d2 100644
--- a/lib/private/files/mount/mount.php
+++ b/lib/private/files/mount/mount.php
@@ -28,7 +28,7 @@ class Mount {
private $loader;
/**
- * @param string | \OC\Files\Storage\Storage $storage
+ * @param string|\OC\Files\Storage\Storage $storage
* @param string $mountpoint
* @param array $arguments (optional)\
* @param \OC\Files\Storage\Loader $loader
diff --git a/lib/private/files/type/templatemanager.php b/lib/private/files/type/templatemanager.php
index cd1536d2732..e693e7079a5 100644
--- a/lib/private/files/type/templatemanager.php
+++ b/lib/private/files/type/templatemanager.php
@@ -19,7 +19,7 @@ class TemplateManager {
* get the path of the template for a mimetype
*
* @param string $mimetype
- * @return string | null
+ * @return string|null
*/
public function getTemplatePath($mimetype) {
if (isset($this->templates[$mimetype])) {
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index d3772e264a0..a53c2fbb322 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -796,7 +796,7 @@ class View {
* @param string $path
* @param boolean $includeMountPoints whether to add mountpoint sizes,
* defaults to true
- * @return \OC\Files\FileInfo | false
+ * @return \OC\Files\FileInfo|false
*/
public function getFileInfo($path, $includeMountPoints = true) {
$data = array();
@@ -991,7 +991,7 @@ class View {
* change file metadata
*
* @param string $path
- * @param array | \OCP\Files\FileInfo $data
+ * @param array|\OCP\Files\FileInfo $data
* @return int
*
* returns the fileid of the updated file