Merge pull request #3682 from LibreSign/backport/3670/stable29

[stable29] fix: notification parameters need to be string
LibreSign · Sep 13, 2024 · f65336f · f65336f
2 parents e0e875e + 2ed41e9
commit f65336f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/lib/Activity/Listener.php b/lib/Activity/Listener.php
@@ -114,7 +114,7 @@ protected function generateNewSignNotificationActivity(
 				),
 				'signRequest' => [
 					'type' => 'sign-request',
-					'id' => $signRequest->getId(),
+					'id' => (string)$signRequest->getId(),
 					'name' => $actor->getDisplayName(),
 				],
 			]);
@@ -126,12 +126,12 @@ protected function generateNewSignNotificationActivity(
 	}
 
 	/**
-	 * @return array{type: 'file', id: int, name: string, path: string, link: string}
+	 * @return array{type: 'file', id: string, name: string, path: string, link: string}
 	 */
 	protected function getFileParameter(SignRequest $signRequest, FileEntity $libreSignFile): array {
 		return [
 			'type' => 'file',
-			'id' => $libreSignFile->getNodeId(),
+			'id' => (string)$libreSignFile->getNodeId(),
 			'name' => $libreSignFile->getName(),
 			'path' => $libreSignFile->getName(),
 			'link' => $this->url->linkToRouteAbsolute('libresign.page.sign', ['uuid' => $signRequest->getUuid()]),

diff --git a/lib/Listener/NotificationListener.php b/lib/Listener/NotificationListener.php
@@ -93,7 +93,7 @@ private function sendSignNotification(
 			'file' => $this->getFileParameter($signRequest, $libreSignFile),
 			'signRequest' => [
 				'type' => 'sign-request',
-				'id' => $signRequest->getId(),
+				'id' => (string)$signRequest->getId(),
 				'name' => $actor->getDisplayName(),
 			],
 		]);
@@ -122,14 +122,12 @@ public function isNotificationDisabledAtActivity(IIdentifyMethod $identifyMethod
 	}
 
 	/**
-	 * @return (int|string)[]
-	 *
-	 * @psalm-return array{type: 'file', id: int, name: string, path: string, link: string}
+	 * @psalm-return array{type: 'file', id: string, name: string, path: string, link: string}
 	 */
 	protected function getFileParameter(SignRequest $signRequest, FileEntity $libreSignFile): array {
 		return [
 			'type' => 'file',
-			'id' => $libreSignFile->getNodeId(),
+			'id' => (string)$libreSignFile->getNodeId(),
 			'name' => $libreSignFile->getName(),
 			'path' => $libreSignFile->getName(),
 			'link' => $this->url->linkToRouteAbsolute('libresign.page.sign', ['uuid' => $signRequest->getUuid()]),