address review

Signed-off-by: Simon L <szaimen@e.mail.de>
nextcloud · Nov 3, 2023 · b681cf7 · b681cf7
1 parent 531f5d1
commit b681cf7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
@@ -3075,14 +3075,7 @@
   <file src="lib/private/Preview/Generator.php">
     <InvalidArgument>
       <code>$maxPreviewImage</code>
-      <code>$semId</code>
     </InvalidArgument>
-    <InvalidReturnStatement>
-      <code>$sem</code>
-    </InvalidReturnStatement>
-    <InvalidReturnType>
-      <code>false|resource</code>
-    </InvalidReturnType>
     <LessSpecificReturnType>
       <code>null|string</code>
     </LessSpecificReturnType>

diff --git a/lib/private/Preview/Generator.php b/lib/private/Preview/Generator.php
@@ -221,7 +221,7 @@ public function generatePreviews(File $file, array $specifications, $mimeType =
 	 *
 	 * @param int $semId
 	 * @param int $concurrency
-	 * @return false|resource the semaphore on success or false on failure
+	 * @return false|\SysvSemaphore the semaphore on success or false on failure
 	 */
 	public static function guardWithSemaphore(int $semId, int $concurrency) {
 		if (!extension_loaded('sysvsem')) {
@@ -240,11 +240,11 @@ public static function guardWithSemaphore(int $semId, int $concurrency) {
 	/**
 	 * Releases the semaphore acquired from {@see Generator::guardWithSemaphore()}.
 	 *
-	 * @param resource|bool $semId the semaphore identifier returned by guardWithSemaphore
+	 * @param false|\SysvSemaphore $semId the semaphore identifier returned by guardWithSemaphore
 	 * @return bool
 	 */
-	public static function unguardWithSemaphore($semId): bool {
-		if ($semId === false || get_class($semId) !== 'SysvSemaphore' || !extension_loaded('sysvsem')) {
+	public static function unguardWithSemaphore(false|\SysvSemaphore $semId): bool {
+		if ($semId === false || !($semId instanceof \SysvSemaphore)) {
 			return false;
 		}
 		return sem_release($semId);