Fix notifications #5959
Merged
Fix notifications #5959
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
The notification about wrong login was not working. Noticed while working on FreshRSS#5955 This was due to timing of when the notification is retrieved. Simplified code to make the logic easier and more robust.
Frenzie
approved these changes
Dec 21, 2023
| $status = $this->notification['type']; | ||
|
|
||
| $notif = Minz_Request::getNotification(); | ||
| if (!empty($notif)) { |
There was a problem hiding this comment.
Suggested change
| if (!empty($notif)) { | |
| if ($notif !== null && array_key_exists('content', $notif) && array_key_exists('type', $notif)) { |
There was a problem hiding this comment.
The check is already done by type declaration (this code already passes PHPStan Level 9). And if anything, array_key_exists does not seem like the correct test as it accepts null, which we do not want.
We could consider using ?? below for providing default values, but I do not think it is necessary for now.
| $msg = $this->notification['content']; | ||
| $status = $this->notification['type']; | ||
| $notif = Minz_Request::getNotification(); | ||
| if (!empty($notif)) { |
There was a problem hiding this comment.
Suggested change
| if (!empty($notif)) { | |
| if ($notif !== null && array_key_exists('content', $notif) && array_key_exists('type', $notif)) { |
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.
The notification about wrong login was not working. Noticed while working on #5955
This was due to timing of when the notification is retrieved.
Simplified code to make the logic easier and more robust.