OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Simplified some match expressions

Browse Source
This commit is contained in:
Alejandro Celaya 2022-01-01 18:40:48 +01:00
parent 18b4caa55e
commit 8e1cd67a3d
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/autoload/entity-manager.global.php
View File

@ -21,8 +21,8 @@ return (static function (): array {
'mssql' => '1433', 'mssql' => '1433',
default => '3306', default => '3306',
}; };
$resolveConnection = static fn () => match (true) { $resolveConnection = static fn () => match ($driver) {
$driver === null || $driver === 'sqlite' => [ null, 'sqlite' => [
'driver' => 'pdo_sqlite', 'driver' => 'pdo_sqlite',
'path' => 'data/database.sqlite', 'path' => 'data/database.sqlite',
], ],

4
config/autoload/redis.global.php
View File

@ -7,8 +7,8 @@ use function Shlinkio\Shlink\Common\env;
return (static function (): array { return (static function (): array {
$redisServers = env('REDIS_SERVERS'); $redisServers = env('REDIS_SERVERS');
return match (true) { return match ($redisServers) {
$redisServers === null => [], null => [],
default => [ default => [
'cache' => [ 'cache' => [
'redis' => [ 'redis' => [

7
module/Core/src/Visit/RequestTracker.php
View File

@ -83,10 +83,9 @@ class RequestTracker implements RequestTrackerInterface, RequestMethodInterface
$disableTrackingFrom = $this->trackingOptions->disableTrackingFrom(); $disableTrackingFrom = $this->trackingOptions->disableTrackingFrom();
return some($disableTrackingFrom, function (string $value) use ($ip, $remoteAddrParts): bool { return some($disableTrackingFrom, function (string $value) use ($ip, $remoteAddrParts): bool {
$range = match (true) { $range = str_contains($value, '*')
str_contains($value, '*') => $this->parseValueWithWildcards($value, $remoteAddrParts), ? $this->parseValueWithWildcards($value, $remoteAddrParts)
default => Factory::parseRangeString($value), : Factory::parseRangeString($value);
};
return $range !== null && $ip->matches($range); return $range !== null && $ip->matches($range);
}); });

2
module/Rest/src/Service/ApiKeyService.php
View File

@ -41,7 +41,7 @@ class ApiKeyService implements ApiKeyServiceInterface
$expirationDate !== null && $name !== null => ApiKey::fromMeta( $expirationDate !== null && $name !== null => ApiKey::fromMeta(
ApiKeyMeta::withNameAndExpirationDate($name, $expirationDate), ApiKeyMeta::withNameAndExpirationDate($name, $expirationDate),
), ),
$expirationDate !== null => ApiKey::fromMeta(ApiKeyMeta::withExpirationDate($expirationDate)), $expirationDate !== null => ApiKey::fromMeta(ApiKeyMeta::withExpirationDate($expirationDate)),
$name !== null => ApiKey::fromMeta(ApiKeyMeta::withName($name)), $name !== null => ApiKey::fromMeta(ApiKeyMeta::withName($name)),
default => ApiKey::create(), default => ApiKey::create(),
}; };