refactor: Use the elvis operator + fix: Handle null checks with the ?? operator #48042
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: Christoph Wurst <[email protected]>
ChristophWurst
requested review from
miaulalala and
tcitworld
as code owners
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -646,8 +646,7 @@ | |||
| try { | |||
| $accountProperty = $account->getProperty($property); | |||
| $currentValue = $accountProperty->getValue(); | |||
| $scope = ($accountProperty->getScope() ? $accountProperty->getScope() | |||
| : $defaultScopes[$property]); | |||
| $scope = ($accountProperty->getScope() ?: $defaultScopes[$property]); | |||
Check notice
Code scanning / Psalm
RedundantConditionGivenDocblockType Note
| @@ -121,7 +121,7 @@ | |||
| $this->config->setUserValue($this->userId, Application::APP_ID, 'lon', strval($lon)); | |||
| // resolve and store formatted address | |||
| $address = $this->resolveLocation($lat, $lon); | |||
| $address = $address ? $address : $this->l10n->t('Unknown address'); | |||
| $address = $address ?: $this->l10n->t('Unknown address'); | |||
Check notice
Code scanning / Psalm
RiskyTruthyFalsyComparison Note
miaulalala
approved these changes
Sep 15, 2024
|
|
kesselb
reviewed
Sep 15, 2024
kesselb
reviewed
Sep 15, 2024
lib/private/Log/LogDetails.php
Outdated
| @@ -37,7 +37,7 @@ public function logDetails(string $app, $message, int $level): array { | |||
| $url = ($request->getRequestUri() !== '') ? $request->getRequestUri() : '--'; | |||
| $method = is_string($request->getMethod()) ? $request->getMethod() : '--'; | |||
| if ($this->config->getValue('installed', false)) { | |||
| $user = \OC_User::getUser() ? \OC_User::getUser() : '--'; | |||
| $user = \OC_User::getUser() ?: '--'; | |||
There was a problem hiding this comment.
Uid "0" would also evaluate to '--'
There was a problem hiding this comment.
Yes, same as with the ternary operator
Signed-off-by: Christoph Wurst <[email protected]>
ChristophWurst
changed the title
skjnldsv
approved these changes
Sep 15, 2024
fsamapoor
approved these changes
Sep 15, 2024
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
Makes code easier to read.
TODO
Checklist