fix(psalm): Match psalm definitions

Signed-off-by: Joas Schilling <[email protected]>
nextcloud · Aug 28, 2024 · 24a26e7 · 24a26e7
1 parent d19361b
commit 24a26e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/Capabilities.php b/lib/Capabilities.php
@@ -175,6 +175,8 @@ public function getCapabilities(): array {
 			return [];
 		}
 
+		/** @psalm-var non-empty-string $version */
+		$version = $this->appManager->getAppVersion('spreed');
 		$capabilities = [
 			'features' => self::FEATURES,
 			'features-local' => self::LOCAL_FEATURES,
@@ -211,15 +213,15 @@ public function getCapabilities(): array {
 					'only-trusted-servers' => true,
 				],
 				'previews' => [
-					'max-gif-size' => (int)$this->serverConfig->getAppValue('spreed', 'max-gif-size', '3145728'),
+					'max-gif-size' => max(0, (int)$this->serverConfig->getAppValue('spreed', 'max-gif-size', '3145728')),
 				],
 				'signaling' => [
 					'session-ping-limit' => max(0, (int)$this->serverConfig->getAppValue('spreed', 'session-ping-limit', '200')),
 					// 'hello-v2-token-key' => string,
 				],
 			],
 			'config-local' => self::LOCAL_CONFIGS,
-			'version' => $this->appManager->getAppVersion('spreed'),
+			'version' => $version,
 		];
 
 		if ($this->serverConfig->getAppValue('core', 'backgroundjobs_mode', 'ajax') === 'cron') {
@@ -246,7 +248,7 @@ public function getCapabilities(): array {
 		}
 
 		$pubKey = $this->talkConfig->getSignalingTokenPublicKey();
-		if ($pubKey) {
+		if ($pubKey !== '') {
 			$capabilities['config']['signaling']['hello-v2-token-key'] = $pubKey;
 		}
 

diff --git a/lib/ResponseDefinitions.php b/lib/ResponseDefinitions.php
@@ -288,7 +288,7 @@
  *
  * @psalm-type TalkSignalingSession = array{
  *     actorId: non-empty-string,
- *     actorType: non-empty-string,
+ *     actorType: TalkActorTypes,
  *     inCall: TalkCallFlags,
  *     lastPing: int<0, max>,
  *     participantPermissions: TalkPermissions,