share_id should be string according to \OCP\Share\IShare interface

karakayasemi · karakayasemi · commit 8afe84db6cc4 · 2020-07-28T14:16:39.000-07:00
diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php
@@ -878,7 +878,7 @@ private function getRawShare($id) {
 	 */
 	private function createShareObject($data) {
 		$share = new Share($this->rootFolder, $this->userManager);
-		$share->setId((int)$data['id'])
+		$share->setId($data['id'])
 			->setShareType((int)$data['share_type'])
 			->setPermissions((int)$data['permissions'])
 			->setTarget($data['file_target'])
diff --git a/apps/files_sharing/lib/ExpireSharesJob.php b/apps/files_sharing/lib/ExpireSharesJob.php
@@ -96,7 +96,7 @@ public function run($argument) {
 		$shares = $qb->execute();
 		while ($share = $shares->fetch()) {
 			try {
-				$shareObject = $this->defaultShareProvider->getShareById($share['id']);
+				$shareObject = $this->defaultShareProvider->getShareById((string)$share['id']);
 				$this->shareManager->deleteShare($shareObject);
 			} catch (ShareNotFound $ex) {
 				//already deleted
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
@@ -493,7 +493,7 @@ public function getAllSharesBy($userId, $shareTypes, $nodeIDs, $reshares) {
 			}
 			$cursor->closeCursor();
 		}
-		
+
 		return $shares;
 	}
 
@@ -569,7 +569,7 @@ public function getShareById($id, $recipientId = null) {
 				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
 				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
 			));
-		
+
 		$cursor = $qb->execute();
 		$data = $cursor->fetch();
 		$cursor->closeCursor();
@@ -945,7 +945,7 @@ public function getShareByToken($token) {
 
 		return $share;
 	}
-	
+
 	/**
 	 * Create a share object from an database row
 	 *
@@ -955,7 +955,7 @@ public function getShareByToken($token) {
 	 */
 	private function createShare($data) {
 		$share = new Share($this->rootFolder, $this->userManager);
-		$share->setId((int)$data['id'])
+		$share->setId($data['id'])
 			->setShareType((int)$data['share_type'])
 			->setPermissions((int)$data['permissions'])
 			->setTarget($data['file_target'])
@@ -1086,7 +1086,7 @@ private function resolveGroupShares($shares, $userId) {
 			}
 			$stmt->closeCursor();
 		}
-		
+
 		$resolvedShares = \array_values($shareIdToShareMap);
 		return $resolvedShares;
 	}
diff --git a/lib/public/Share/IShareProvider.php b/lib/public/Share/IShareProvider.php
@@ -135,11 +135,11 @@ public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offs
 	 * @since 10.0.0
 	 */
 	public function getAllSharesBy($userId, $shareTypes, $nodeIDs, $reshares);
-	
+
 	/**
 	 * Get share by id
 	 *
-	 * @param int $id
+	 * @param string $id
 	 * @param string|null $recipientId
 	 * @return \OCP\Share\IShare
 	 * @throws ShareNotFound
@@ -168,7 +168,7 @@ public function getSharesByPath(Node $path);
 	 * @since 10.0.0
 	 */
 	public function getAllSharedWith($userId, $node);
-	
+
 	/**
 	 * Get shared with the given user specifying share type predicate for this specific share provider
 	 *

Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ public function getAllSharesBy($userId, $shareTypes, $nodeIDs, $reshares) {`
`493`	`493`	`}`
`494`	`494`	`$cursor->closeCursor();`
`495`	`495`	`}`
`496`		`-`
	`496`	`+`
`497`	`497`	`return $shares;`
`498`	`498`	`}`
`499`	`499`
`@@ -569,7 +569,7 @@ public function getShareById($id, $recipientId = null) {`
`569`	`569`	`$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),`
`570`	`570`	`$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))`
`571`	`571`	`));`
`572`		`-`
	`572`	`+`
`573`	`573`	`$cursor = $qb->execute();`
`574`	`574`	`$data = $cursor->fetch();`
`575`	`575`	`$cursor->closeCursor();`
`@@ -945,7 +945,7 @@ public function getShareByToken($token) {`
`945`	`945`
`946`	`946`	`return $share;`
`947`	`947`	`}`
`948`		`-`
	`948`	`+`
`949`	`949`	`/**`
`950`	`950`	`* Create a share object from an database row`
`951`	`951`	`*`
`@@ -955,7 +955,7 @@ public function getShareByToken($token) {`
`955`	`955`	`*/`
`956`	`956`	`private function createShare($data) {`
`957`	`957`	`$share = new Share($this->rootFolder, $this->userManager);`
`958`		`- $share->setId((int)$data['id'])`
	`958`	`+ $share->setId($data['id'])`
`959`	`959`	`->setShareType((int)$data['share_type'])`
`960`	`960`	`->setPermissions((int)$data['permissions'])`
`961`	`961`	`->setTarget($data['file_target'])`
`@@ -1086,7 +1086,7 @@ private function resolveGroupShares($shares, $userId) {`
`1086`	`1086`	`}`
`1087`	`1087`	`$stmt->closeCursor();`
`1088`	`1088`	`}`
`1089`		`-`
	`1089`	`+`
`1090`	`1090`	`$resolvedShares = \array_values($shareIdToShareMap);`
`1091`	`1091`	`return $resolvedShares;`
`1092`	`1092`	`}`