Skip to content

Commit

Permalink
Merge branch '6.3' into 6.4
Browse files Browse the repository at this point in the history
* 6.3:
  Use extension_loaded call to check if pcntl extension is loaded, as SIGTERM might be set be swoole
  [DomCrawler] UriResolver support path with columns
  attach all required parameters to query
  Bump Symfony version to 6.3.9
  Update VERSION for 6.3.8
  Update CHANGELOG for 6.3.8
  Bump Symfony version to 5.4.32
  Update VERSION for 5.4.31
  Update CONTRIBUTORS for 5.4.31
  Update CHANGELOG for 5.4.31
  Update VERSION for 4.4.51
  Update CHANGELOG for 4.4.51
  [Validator] updated Lithuanian translation
  • Loading branch information
derrabus committed Nov 14, 2023
2 parents 984c48b + 09ac965 commit 511fe4c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Command/ConsumeMessagesCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti

public function getSubscribedSignals(): array
{
return $this->signals ?? (\defined('SIGTERM') ? [\SIGTERM, \SIGINT] : []);
return $this->signals ?? (\extension_loaded('pcntl') ? [\SIGTERM, \SIGINT] : []);
}

public function handleSignal(int $signal, int|false $previousExitCode = 0): int|false
Expand Down
2 changes: 1 addition & 1 deletion Command/FailedMessagesRetryCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int

public function getSubscribedSignals(): array
{
return $this->signals ?? (\defined('SIGTERM') ? [\SIGTERM, \SIGINT] : []);
return $this->signals ?? (\extension_loaded('pcntl') ? [\SIGTERM, \SIGINT] : []);
}

public function handleSignal(int $signal, int|false $previousExitCode = 0): int|false
Expand Down
2 changes: 1 addition & 1 deletion EventListener/StopWorkerOnSignalsListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class StopWorkerOnSignalsListener implements EventSubscriberInterface

public function __construct(array $signals = null, LoggerInterface $logger = null)
{
if (null === $signals && \defined('SIGTERM')) {
if (null === $signals && \extension_loaded('pcntl')) {
$signals = [\SIGTERM, \SIGINT];
}
$this->signals = $signals ?? [];
Expand Down
2 changes: 1 addition & 1 deletion EventListener/StopWorkerOnSigtermSignalListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ class StopWorkerOnSigtermSignalListener extends StopWorkerOnSignalsListener
{
public function __construct(LoggerInterface $logger = null)
{
parent::__construct(\defined('SIGTERM') ? [\SIGTERM] : [], $logger);
parent::__construct(\extension_loaded('pcntl') ? [\SIGTERM] : [], $logger);
}
}

0 comments on commit 511fe4c

Please sign in to comment.