diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index 2002e3bf8cbc6a815b3d14acbcaf0c68b7ad7b4f..60859c485c74b14a3c09cb0cf49783f012435735 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 f2f4acf8d00e0d9e400517688bfa71e70c54ff78..9468a1de306af4a486f08b75df4b094bc52d9117 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 e8c69e06f9fd327df7fc53aa927f36cdb60a2b3d..a74ab5fe7968306cb525c4ae9c96dc7be3083095 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 db444d36935fa18233f424d1cc2bd99b707854b4..7d134583317adfd1b3147705795894e256024f2d 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