diff options
author | Morris Jobke <hey@morrisjobke.de> | 2020-08-19 18:54:00 +0300 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2020-08-19 19:16:35 +0300 |
commit | fedf9c69d9c84fc0399badef39ed765de72c08f1 (patch) | |
tree | bfaae1e7efb907cb236769fada35a9cd05ebf29e /apps/files_sharing | |
parent | 60be722ee8781d9e94ecc66d62c0e5fcb7e3934e (diff) |
Use matching parameter names form interfaces and implementations
Found by Psalm 3.14.1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps/files_sharing')
-rw-r--r-- | apps/files_sharing/lib/MountProvider.php | 6 | ||||
-rw-r--r-- | apps/files_sharing/lib/ShareBackend/File.php | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/apps/files_sharing/lib/MountProvider.php b/apps/files_sharing/lib/MountProvider.php index bbb9da3a775..402061c7905 100644 --- a/apps/files_sharing/lib/MountProvider.php +++ b/apps/files_sharing/lib/MountProvider.php @@ -71,10 +71,10 @@ class MountProvider implements IMountProvider { * Get all mountpoints applicable for the user and check for shares where we need to update the etags * * @param \OCP\IUser $user - * @param \OCP\Files\Storage\IStorageFactory $storageFactory + * @param \OCP\Files\Storage\IStorageFactory $loader * @return \OCP\Files\Mount\IMountPoint[] */ - public function getMountsForUser(IUser $user, IStorageFactory $storageFactory) { + public function getMountsForUser(IUser $user, IStorageFactory $loader) { $shares = $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_USER, null, -1); $shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_GROUP, null, -1)); $shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_CIRCLE, null, -1)); @@ -120,7 +120,7 @@ class MountProvider implements IMountProvider { 'ownerView' => $ownerViews[$owner], 'sharingDisabledForUser' => $sharingDisabledForUser ], - $storageFactory, + $loader, $view, $foldersExistCache ); diff --git a/apps/files_sharing/lib/ShareBackend/File.php b/apps/files_sharing/lib/ShareBackend/File.php index cdda89cbc63..53810d59eba 100644 --- a/apps/files_sharing/lib/ShareBackend/File.php +++ b/apps/files_sharing/lib/ShareBackend/File.php @@ -89,14 +89,15 @@ class File implements \OCP\Share_Backend_File_Dependent { /** * create unique target - * @param string $filePath + * + * @param string $itemSource * @param string $shareWith * @param array $exclude (optional) * @return string */ - public function generateTarget($filePath, $shareWith, $exclude = null) { + public function generateTarget($itemSource, $shareWith, $exclude = null) { $shareFolder = \OCA\Files_Sharing\Helper::getShareFolder(); - $target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($filePath)); + $target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($itemSource)); // for group shares we return the target right away if ($shareWith === false) { |