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

Merge pull request #1292 from acelaya-forks/feature/simplify-matches

Browse Source 
Simplified some match expressions
This commit is contained in:
Alejandro Celaya 2022-01-01 21:15:45 +01:00 committed by GitHub
commit 4103ccf791
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -52,7 +52,7 @@
"shlinkio/shlink-config": "^1.4", "shlinkio/shlink-config": "^1.4",
"shlinkio/shlink-event-dispatcher": "^2.3", "shlinkio/shlink-event-dispatcher": "^2.3",
"shlinkio/shlink-importer": "^2.5", "shlinkio/shlink-importer": "^2.5",
"shlinkio/shlink-installer": "dev-develop#64f8ab2 as 7.0", "shlinkio/shlink-installer": "dev-develop#a008036 as 7.0",
"shlinkio/shlink-ip-geolocation": "^2.2", "shlinkio/shlink-ip-geolocation": "^2.2",
"symfony/console": "^6.0", "symfony/console": "^6.0",
"symfony/filesystem": "^6.0", "symfony/filesystem": "^6.0",

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);
}); });