Skip to content
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.

Sign up for GitHub

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

Remove unneeded isset check #22809

Merged
merged 1 commit into from
Sep 14, 2020
Merged

Remove unneeded isset check #22809

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/private/AllConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ public function setUserValue($userId, $appName, $key, $value, $preCondition = nu
*/
public function getUserValue($userId, $appName, $key, $default = '') {
$data = $this->getUserValues($userId);
if (isset($data[$appName]) and isset($data[$appName][$key])) {
if (isset($data[$appName][$key])) {
Copy link
Contributor

@kesselb kesselb Sep 11, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

return $data[$appName][$key] ?? $default;

https://3v4l.org/J6vOL should also work. But current approach is also fine.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One step after the other.

return $data[$appName][$key];
} else {
return $default;
Expand Down Expand Up @@ -355,7 +355,7 @@ public function deleteUserValue($userId, $appName, $key) {
'WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?';
$this->connection->executeUpdate($sql, [$userId, $appName, $key]);

if (isset($this->userCache[$userId]) and isset($this->userCache[$userId][$appName])) {
if (isset($this->userCache[$userId][$appName])) {
unset($this->userCache[$userId][$appName][$key]);
}
}
Expand Down