mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-03-28 04:22:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix incorrect timeout in init commands

Browse source
This commit is contained in:
Alejandro Celaya 2023-06-15 18:53:42 +02:00
parent 228bd83b75
commit b17c576a30
5 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
CHANGELOG.md
View file

@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org). The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).
## [Unreleased]
### Added
* *Nothing*
### Changed
* *Nothing*
### Deprecated
* *Nothing*
### Removed
* *Nothing*
### Fixed
* [#1819](https://github.com/shlinkio/shlink/issues/1819) Fix incorrect timeout when running DB commands during Shlink start-up.
## [3.6.3] - 2023-06-14 ## [3.6.3] - 2023-06-14
### Added ### Added
* *Nothing* * *Nothing*

2
composer.json
View file

@ -49,7 +49,7 @@
"shlinkio/shlink-config": "^2.4", "shlinkio/shlink-config": "^2.4",
"shlinkio/shlink-event-dispatcher": "^3.0", "shlinkio/shlink-event-dispatcher": "^3.0",
"shlinkio/shlink-importer": "^5.1", "shlinkio/shlink-importer": "^5.1",
"shlinkio/shlink-installer": "^8.4.1", "shlinkio/shlink-installer": "^8.4.2",
"shlinkio/shlink-ip-geolocation": "^3.2", "shlinkio/shlink-ip-geolocation": "^3.2",
"shlinkio/shlink-json": "^1.0", "shlinkio/shlink-json": "^1.0",
"spiral/roadrunner": "^2023.1", "spiral/roadrunner": "^2023.1",

4
module/CLI/src/Util/ProcessRunner.php
View file

@ -23,8 +23,8 @@ class ProcessRunner implements ProcessRunnerInterface
public function __construct(private ProcessHelper $helper, ?callable $createProcess = null) public function __construct(private ProcessHelper $helper, ?callable $createProcess = null)
{ {
$this->createProcess = $createProcess !== null $this->createProcess = $createProcess !== null
? Closure::fromCallable($createProcess) ? $createProcess(...)
: static fn (array $cmd) => new Process($cmd, null, null, null, LockedCommandConfig::DEFAULT_TTL); : static fn (array $cmd) => new Process($cmd, timeout: LockedCommandConfig::DEFAULT_TTL);
} }
public function run(OutputInterface $output, array $cmd): void public function run(OutputInterface $output, array $cmd): void

2
module/Core/src/Model/DeviceType.php
View file

@ -12,7 +12,7 @@ enum DeviceType: string
public static function matchFromUserAgent(string $userAgent): ?self public static function matchFromUserAgent(string $userAgent): ?self
{ {
$detect = new MobileDetect(null, $userAgent); // @phpstan-ignore-line $detect = new MobileDetect(userAgent: $userAgent); // @phpstan-ignore-line
return match (true) { return match (true) {
// $detect->is('iOS') && $detect->isTablet() => self::IOS, // TODO To detect iPad only // $detect->is('iOS') && $detect->isTablet() => self::IOS, // TODO To detect iPad only

2
module/Rest/src/Action/Tag/ListTagsAction.php
View file

@ -40,7 +40,7 @@ class ListTagsAction extends AbstractRestAction
// This part is deprecated. To get tags with stats, the /tags/stats endpoint should be used instead // This part is deprecated. To get tags with stats, the /tags/stats endpoint should be used instead
$tagsInfo = $this->tagService->tagsInfo($params, $apiKey); $tagsInfo = $this->tagService->tagsInfo($params, $apiKey);
$rawTags = $this->serializePaginator($tagsInfo, null, 'stats'); $rawTags = $this->serializePaginator($tagsInfo, dataProp: 'stats');
$rawTags['data'] = map($tagsInfo, static fn (TagInfo $info) => $info->tag); $rawTags['data'] = map($tagsInfo, static fn (TagInfo $info) => $info->tag);
return new JsonResponse(['tags' => $rawTags]); return new JsonResponse(['tags' => $rawTags]);