From 5a00870a2b4710c37134867d9515985ac1c88611 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Mon, 31 Oct 2016 20:19:00 +0100
Subject: [PATCH] Stricter signature
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
lib/private/Share20/DefaultShareProvider.php | 3 ++-
lib/private/Share20/Manager.php | 2 +-
lib/public/Share/IManager.php | 5 +++--
lib/public/Share/IShareProvider.php | 5 +++--
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
index 2002e3bf8cb..60859c485c7 100644
--- a/lib/private/Share20/DefaultShareProvider.php
+++ b/lib/private/Share20/DefaultShareProvider.php
@@ -24,6 +24,7 @@
namespace OC\Share20;
use OCP\Files\File;
+use OCP\Files\Folder;
use OCP\Share\IShareProvider;
use OC\Share20\Exception\InvalidShare;
use OC\Share20\Exception\ProviderException;
@@ -454,7 +455,7 @@ class DefaultShareProvider implements IShareProvider {
return $share;
}
- public function getSharesInFolder($userId, $node, $reshares) {
+ public function getSharesInFolder($userId, Folder $node, $reshares) {
$qb = $this->dbConn->getQueryBuilder();
$qb->select('*')
->from('share', 's')
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index f2f4acf8d00..9468a1de306 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -883,7 +883,7 @@ class Manager implements IManager {
$provider->move($share, $recipientId);
}
- public function getSharesInFolder($userId, Node $node, $reshares = false) {
+ public function getSharesInFolder($userId, Folder $node, $reshares = false) {
$providers = $this->factory->getAllProviders();
return array_reduce($providers, function($shares, IShareProvider $provider) use ($userId, $node, $reshares) {
diff --git a/lib/public/Share/IManager.php b/lib/public/Share/IManager.php
index e8c69e06f9f..a74ab5fe796 100644
--- a/lib/public/Share/IManager.php
+++ b/lib/public/Share/IManager.php
@@ -22,6 +22,7 @@
namespace OCP\Share;
+use OCP\Files\Folder;
use OCP\Files\Node;
use OCP\Share\Exceptions\ShareNotFound;
@@ -91,12 +92,12 @@ interface IManager {
* Get all shares shared by (initiated) by the provided user in a folder.
*
* @param string $userId
- * @param Node|null $node
+ * @param Folder $node
* @param bool $reshares
* @return IShare[]
* @since 9.2.0
*/
- public function getSharesInFolder($userId, Node $node, $reshares = false);
+ public function getSharesInFolder($userId, Folder $node, $reshares = false);
/**
* Get shares shared by (initiated) by the provided user.
diff --git a/lib/public/Share/IShareProvider.php b/lib/public/Share/IShareProvider.php
index db444d36935..7d134583317 100644
--- a/lib/public/Share/IShareProvider.php
+++ b/lib/public/Share/IShareProvider.php
@@ -22,6 +22,7 @@
namespace OCP\Share;
+use OCP\Files\Folder;
use OCP\Share\Exceptions\ShareNotFound;
use OCP\Files\Node;
@@ -95,12 +96,12 @@ interface IShareProvider {
* Get all shares by the given user in a folder
*
* @param string $userId
- * @param Node|null $node
+ * @param Folder $node
* @param bool $reshares Also get the shares where $user is the owner instead of just the shares where $user is the initiator
* @return \OCP\Share\IShare[]
* @since 9.2.0
*/
- public function getSharesInFolder($userId, $node, $reshares);
+ public function getSharesInFolder($userId, Folder $node, $reshares);
/**
* Get all shares by the given user
--
GitLab