From 915a46bc14767f097c9584de04d1f4cff8b3849d Mon Sep 17 00:00:00 2001 From: Hamid Dehnavi Date: Fri, 7 Jul 2023 03:40:27 +0330 Subject: [PATCH 1/2] Use PHP8's match expression instead of switch Signed-off-by: Hamid Dehnavi --- lib/public/AppFramework/Db/QBMapper.php | 26 +++++++------------ .../Files/StorageNotAvailableException.php | 25 +++++++----------- 2 files changed, 18 insertions(+), 33 deletions(-) diff --git a/lib/public/AppFramework/Db/QBMapper.php b/lib/public/AppFramework/Db/QBMapper.php index 57b996b2c0f66..7b78ba33f2939 100644 --- a/lib/public/AppFramework/Db/QBMapper.php +++ b/lib/public/AppFramework/Db/QBMapper.php @@ -238,24 +238,16 @@ 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 match ($types[$property]) { + 'int', 'integer' => IQueryBuilder::PARAM_INT, + '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, + }; - return IQueryBuilder::PARAM_STR; } /** diff --git a/lib/public/Files/StorageNotAvailableException.php b/lib/public/Files/StorageNotAvailableException.php index f600ef808084d..d29f6cd54767e 100644 --- a/lib/public/Files/StorageNotAvailableException.php +++ b/lib/public/Files/StorageNotAvailableException.php @@ -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', + }; } } From c3dfeeae9664f43fa754cfedb525be5fac68f39c Mon Sep 17 00:00:00 2001 From: Hamid Dehnavi Date: Fri, 7 Jul 2023 03:42:52 +0330 Subject: [PATCH 2/2] Fix code styles Signed-off-by: Hamid Dehnavi --- lib/public/AppFramework/Db/QBMapper.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/public/AppFramework/Db/QBMapper.php b/lib/public/AppFramework/Db/QBMapper.php index 7b78ba33f2939..d8c4d9254a61e 100644 --- a/lib/public/AppFramework/Db/QBMapper.php +++ b/lib/public/AppFramework/Db/QBMapper.php @@ -247,7 +247,6 @@ protected function getParameterTypeForProperty(Entity $entity, string $property) 'json' => IQueryBuilder::PARAM_JSON, default => IQueryBuilder::PARAM_STR, }; - } /**