Skip to content

Use PHP8's match expression instead of switch #39208

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

Closed
shdehnavi wants to merge 2 commits into from
Closed

Use PHP8's match expression instead of switch #39208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
915a46b
Use PHP8's match expression instead of switch
shdehnavi Jul 7, 2023
c3dfeea
Fix code styles
shdehnavi Jul 7, 2023
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
27 changes: 9 additions & 18 deletions lib/public/AppFramework/Db/QBMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,24 +238,15 @@ protected function getParameterTypeForProperty(Entity $entity, string $property)
return IQueryBuilder::PARAM_STR;
}

switch ($types[ $property ]) {
case 'int':
case 'integer':
return IQueryBuilder::PARAM_INT;
case 'string':
return IQueryBuilder::PARAM_STR;
case 'bool':
case 'boolean':
return IQueryBuilder::PARAM_BOOL;
case 'blob':
return IQueryBuilder::PARAM_LOB;
case 'datetime':
return IQueryBuilder::PARAM_DATE;
case 'json':
return IQueryBuilder::PARAM_JSON;
}

return IQueryBuilder::PARAM_STR;
return match ($types[$property]) {
'int', 'integer' => IQueryBuilder::PARAM_INT,
Copy link
Member

@nickvergessen nickvergessen Jul 14, 2023

Choose a reason for hiding this comment

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

As mentioned in the talk PR I think this decreases readability and since it has no advantage we shouldn't do it, so that patches in the area can be backported with less chance for conflicts.

'string' => IQueryBuilder::PARAM_STR,
'bool', 'boolean' => IQueryBuilder::PARAM_BOOL,
'blob' => IQueryBuilder::PARAM_LOB,
'datetime' => IQueryBuilder::PARAM_DATE,
'json' => IQueryBuilder::PARAM_JSON,
default => IQueryBuilder::PARAM_STR,
};
}

/**
Expand Down
25 changes: 9 additions & 16 deletions lib/public/Files/StorageNotAvailableException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,14 @@ public function __construct($message = '', $code = self::STATUS_ERROR, \Exceptio
* @since 9.0.0
*/
public static function getStateCodeName($code) {
switch ($code) {
case self::STATUS_SUCCESS:
return 'ok';
case self::STATUS_ERROR:
return 'error';
case self::STATUS_INDETERMINATE:
return 'indeterminate';
case self::STATUS_UNAUTHORIZED:
return 'unauthorized';
case self::STATUS_TIMEOUT:
return 'timeout';
case self::STATUS_NETWORK_ERROR:
return 'network error';
default:
return 'unknown';
}
return match ($code) {
self::STATUS_SUCCESS => 'ok',
self::STATUS_ERROR => 'error',
self::STATUS_INDETERMINATE => 'indeterminate',
self::STATUS_UNAUTHORIZED => 'unauthorized',
self::STATUS_TIMEOUT => 'timeout',
self::STATUS_NETWORK_ERROR => 'network error',
default => 'unknown',
};
}
}