-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(caldav): convert iMip recipient name to a string #36898
Merged
Merged
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
st3iny
added
bug
3. to review
Waiting for reviews
feature: caldav
Related to CalDAV internals
labels
Feb 28, 2023
st3iny
requested review from
ChristophWurst,
miaulalala and
tcitworld
as code owners
February 28, 2023 13:51
tcitworld
approved these changes
Feb 28, 2023
Signed-off-by: Richard Steinmetz <[email protected]>
st3iny
force-pushed
the
fix/36897/recipient-name-string
branch
from
February 28, 2023 14:21
d34869f
to
2c0d89e
Compare
@@ -173,7 +173,7 @@ | |||
$iTipMessage->scheduleStatus = '5.0; EMail delivery failed'; | |||
return; | |||
} | |||
$recipientName = $iTipMessage->recipientName ?: null; | |||
$recipientName = $iTipMessage->recipientName ? (string)$iTipMessage->recipientName : null; |
Check notice
Code scanning / Psalm
RedundantCastGivenDocblockType
Redundant cast to string given docblock-provided type
nickvergessen
approved these changes
Feb 28, 2023
ChristophWurst
approved these changes
Feb 28, 2023
Applied on our instance |
Now errors a bit further down, as it assumes
|
5 tasks
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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
The recipient name is expected to be a string or null. Before this PR, it was a
Sabre\VObject\Parameter
so we need to convert it to a string.The
\Sabre\VObject\ITip\Message::$recipientName
property should be string or null and is wrongly annotated upstream (in Sabre).TODO
Checklist