aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-03-10 22:17:06 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-03-10 22:17:06 +0100
commitb502667f3a5e6f08fb2fefbac56134d074859c09 (patch)
tree56dbda713859ee4f0b36bc2e746ad722e83cc1fa
parenta14649990242cae1cce2b1035666a5688420a2a4 (diff)
parente6712c47a6f6e4991e90b8bbb89eb71345f6df1b (diff)
downloadnextcloud-server-b502667f3a5e6f08fb2fefbac56134d074859c09.tar.gz
nextcloud-server-b502667f3a5e6f08fb2fefbac56134d074859c09.zip
Merge pull request #23121 from owncloud/scrutinizer_share_fixes
Fix some scrutinizer warning in the sharing code
-rw-r--r--apps/files_sharing/api/ocssharewrapper.php2
-rw-r--r--apps/files_sharing/api/share20ocs.php2
-rw-r--r--lib/public/share/imanager.php4
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_sharing/api/ocssharewrapper.php b/apps/files_sharing/api/ocssharewrapper.php
index 9f63e864cec..a51ad1eb2c9 100644
--- a/apps/files_sharing/api/ocssharewrapper.php
+++ b/apps/files_sharing/api/ocssharewrapper.php
@@ -36,7 +36,7 @@ class OCSShareWrapper {
\OC::$server->getUserSession()->getUser());
}
- public function getAllShares($params) {
+ public function getAllShares() {
return $this->getShare20OCS()->getShares();
}
diff --git a/apps/files_sharing/api/share20ocs.php b/apps/files_sharing/api/share20ocs.php
index f31aa55e34d..5a2af48d6f5 100644
--- a/apps/files_sharing/api/share20ocs.php
+++ b/apps/files_sharing/api/share20ocs.php
@@ -50,7 +50,7 @@ class Share20OCS {
private $request;
/** @var IRootFolder */
private $rootFolder;
- /** @var IUrlGenerator */
+ /** @var IURLGenerator */
private $urlGenerator;
/** @var IUser */
private $currentUser;
diff --git a/lib/public/share/imanager.php b/lib/public/share/imanager.php
index f926104dde0..edb76c46de4 100644
--- a/lib/public/share/imanager.php
+++ b/lib/public/share/imanager.php
@@ -23,7 +23,7 @@ namespace OCP\Share;
use OCP\IUser;
-use OC\Share20\Exception\ShareNotFound;
+use OCP\Share\Exceptions\ShareNotFound;
/**
* Interface IManager
@@ -106,7 +106,7 @@ interface IManager {
*
* @param string $userId
* @param int $shareType
- * @param File|Folder|null $node
+ * @param \OCP\Files\File|\OCP\Files\Folder|null $node
* @param int $limit The maximum number of shares returned, -1 for all
* @param int $offset
* @return IShare[]