From d66facc762e5922d4183b3f2598a0e8cb0433d81 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Tue, 13 Jan 2015 14:51:37 +0100 Subject: [PATCH 1/2] Fix annotations in file view --- lib/private/files/view.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 034c49a9059..648ec1493a8 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -212,6 +212,10 @@ class View { } } + /** + * @param string $path + * @return bool|mixed + */ public function rmdir($path) { $absolutePath = $this->getAbsolutePath($path); $mount = Filesystem::getMountManager()->find($absolutePath); @@ -435,11 +439,18 @@ class View { /** * @param string $directory + * @param bool $empty + * @return bool|mixed */ public function deleteAll($directory, $empty = false) { return $this->rmdir($directory); } + /** + * @param string $path1 + * @param string $path2 + * @return bool|mixed + */ public function rename($path1, $path2) { $postFix1 = (substr($path1, -1, 1) === '/') ? '/' : ''; $postFix2 = (substr($path2, -1, 1) === '/') ? '/' : ''; From 0a400b457778098743c15efd8d2e8f50488630c3 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 13 Jan 2015 16:56:15 +0100 Subject: [PATCH 2/2] drop unused parameter --- lib/private/files/view.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 648ec1493a8..57441c8e680 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -439,10 +439,9 @@ class View { /** * @param string $directory - * @param bool $empty * @return bool|mixed */ - public function deleteAll($directory, $empty = false) { + public function deleteAll($directory) { return $this->rmdir($directory); }