Fix preview generator semaphore typing #37722
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: jld3103 <[email protected]>
provokateurin
commented
Apr 14, 2023
| @@ -311,7 +312,7 @@ private function getSmallImagePreview(ISimpleFolder $previewFolder, File $file, | |||
| * | |||
| * @param int $semId | |||
| * @param int $concurrency | |||
| * @return false|resource the semaphore on success or false on failure | |||
| * @return false|resource|SysvSemaphore the semaphore on success or false on failure | |||
There was a problem hiding this comment.
For some reasone resource still needs to be listed here because psalm gets confused otherwise
There was a problem hiding this comment.
What is psalm saying? Most likely the stubs for this extension are not up to date with php 8, no?
come-nc
reviewed
Apr 17, 2023
| @@ -330,7 +331,7 @@ 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 SysvSemaphore|bool $semId the semaphore identifier returned by guardWithSemaphore | |||
| * @return bool | |||
| */ | |||
| public static function unguardWithSemaphore($semId): bool { | |||
There was a problem hiding this comment.
You need to fix the call to is_resource in here, it will always be false
| @@ -311,7 +312,7 @@ private function getSmallImagePreview(ISimpleFolder $previewFolder, File $file, | |||
| * | |||
| * @param int $semId | |||
| * @param int $concurrency | |||
| * @return false|resource the semaphore on success or false on failure | |||
| * @return false|resource|SysvSemaphore the semaphore on success or false on failure | |||
There was a problem hiding this comment.
What is psalm saying? Most likely the stubs for this extension are not up to date with php 8, no?
| @@ -330,7 +331,7 @@ 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 SysvSemaphore|bool $semId the semaphore identifier returned by guardWithSemaphore | |||
There was a problem hiding this comment.
Suggested change
| * @param SysvSemaphore|bool $semId the semaphore identifier returned by guardWithSemaphore | |
| * @param SysvSemaphore|false $semId the semaphore identifier returned by guardWithSemaphore |
Makes no sense to accept true, no?
This was referenced May 3, 2023
Merged
Closed
Merged
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Split out from #37390
Checklist