diff options
author | Côme Chilliet <91878298+come-nc@users.noreply.github.com> | 2023-04-03 15:08:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-03 15:08:45 +0200 |
commit | dbc0d6a1c27bd511e7598c9f0d9208f13851baef (patch) | |
tree | a6d886b3cd4a16fdd6c821663bb0cedfcdec57fe | |
parent | c5339fa336329ea8c0a6e7d6ba3f02cb69e226b6 (diff) | |
parent | dcf6ebebaba199b310365d8b64438569e76ebd4b (diff) | |
download | nextcloud-server-dbc0d6a1c27bd511e7598c9f0d9208f13851baef.tar.gz nextcloud-server-dbc0d6a1c27bd511e7598c9f0d9208f13851baef.zip |
Merge pull request #37543 from nextcloud/fix/inherited-parameter-names
Fix inherited parameter names
-rw-r--r-- | apps/files_sharing/lib/SharedStorage.php | 12 | ||||
-rw-r--r-- | lib/private/Files/Cache/HomeCache.php | 8 | ||||
-rw-r--r-- | lib/private/Files/Node/NonExistingFile.php | 2 | ||||
-rw-r--r-- | lib/private/Files/Node/NonExistingFolder.php | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php index 2c1ddf9af4a..5243c8d1594 100644 --- a/apps/files_sharing/lib/SharedStorage.php +++ b/apps/files_sharing/lib/SharedStorage.php @@ -224,17 +224,17 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto /** * Get the permissions granted for a shared file * - * @param string $target Shared target file path + * @param string $path Shared target file path * @return int CRUDS permissions granted */ - public function getPermissions($target = ''): int { + public function getPermissions($path = ''): int { if (!$this->isValid()) { return 0; } - $permissions = parent::getPermissions($target) & $this->superShare->getPermissions(); + $permissions = parent::getPermissions($path) & $this->superShare->getPermissions(); // part files and the mount point always have delete permissions - if ($target === '' || pathinfo($target, PATHINFO_EXTENSION) === 'part') { + if ($path === '' || pathinfo($path, PATHINFO_EXTENSION) === 'part') { $permissions |= \OCP\Constants::PERMISSION_DELETE; } @@ -517,9 +517,9 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto } /** - * @param bool $available + * @param bool $isAvailable */ - public function setAvailability($available) { + public function setAvailability($isAvailable) { // shares do not participate in availability logic } diff --git a/lib/private/Files/Cache/HomeCache.php b/lib/private/Files/Cache/HomeCache.php index 6b6b94c3f20..5ea65b4d1cb 100644 --- a/lib/private/Files/Cache/HomeCache.php +++ b/lib/private/Files/Cache/HomeCache.php @@ -78,12 +78,12 @@ class HomeCache extends Cache { } /** - * @param string $path + * @param string $file * @return ICacheEntry */ - public function get($path) { - $data = parent::get($path); - if ($path === '' or $path === '/') { + public function get($file) { + $data = parent::get($file); + if ($file === '' or $file === '/') { // only the size of the "files" dir counts $filesData = parent::get('files'); diff --git a/lib/private/Files/Node/NonExistingFile.php b/lib/private/Files/Node/NonExistingFile.php index b21a2a6c65b..f42f2e33b72 100644 --- a/lib/private/Files/Node/NonExistingFile.php +++ b/lib/private/Files/Node/NonExistingFile.php @@ -37,7 +37,7 @@ class NonExistingFile extends File { throw new NotFoundException(); } - public function copy($newPath) { + public function copy($targetPath) { throw new NotFoundException(); } diff --git a/lib/private/Files/Node/NonExistingFolder.php b/lib/private/Files/Node/NonExistingFolder.php index 100687c3e6f..0d573df7727 100644 --- a/lib/private/Files/Node/NonExistingFolder.php +++ b/lib/private/Files/Node/NonExistingFolder.php @@ -38,7 +38,7 @@ class NonExistingFolder extends Folder { throw new NotFoundException(); } - public function copy($newPath) { + public function copy($targetPath) { throw new NotFoundException(); } @@ -142,11 +142,11 @@ class NonExistingFolder extends Folder { throw new NotFoundException(); } - public function search($pattern) { + public function search($query) { throw new NotFoundException(); } - public function searchByMime($mime) { + public function searchByMime($mimetype) { throw new NotFoundException(); } |