bug #52588 [Messenger] Use extension_loaded call to check if pcntl extension is loaded, as SIGTERM might be set be swoole (Sergii Dolgushev)

derrabus · derrabus · commit 4145dee64426 · 2023-11-14T23:31:37.000+01:00
This PR was merged into the 6.3 branch. Discussion ---------- [Messenger] Use extension_loaded call to check if pcntl extension is loaded, as SIGTERM might be set be swoole | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #52586 | License | MIT It was assumed. that SIGTERM constant is set only by `pcntl` PHP extension. But it is also set by `swoole`. So in some cases `SIGTERM` might be set when `pcntl` is disabled but `swoole` is enabled. Commits ------- d0b4fcf Use extension_loaded call to check if pcntl extension is loaded, as SIGTERM might be set be swoole
diff --git a/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php b/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php
@@ -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
diff --git a/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php b/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php
@@ -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
diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSignalsListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSignalsListener.php
@@ -26,7 +26,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 ?? [];
diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSigtermSignalListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSigtermSignalListener.php
@@ -24,6 +24,6 @@ class StopWorkerOnSigtermSignalListener extends StopWorkerOnSignalsListener
 {
     public function __construct(LoggerInterface $logger = null)
     {
-        parent::__construct(\defined('SIGTERM') ? [SIGTERM] : [], $logger);
+        parent::__construct(\extension_loaded('pcntl') ? [SIGTERM] : [], $logger);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti`
`258`	`258`
`259`	`259`	`public function getSubscribedSignals(): array`
`260`	`260`	`{`
`261`		`- return $this->signals ?? (\defined('SIGTERM') ? [\SIGTERM, \SIGINT] : []);`
	`261`	`+ return $this->signals ?? (\extension_loaded('pcntl') ? [\SIGTERM, \SIGINT] : []);`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`public function handleSignal(int $signal, int\|false $previousExitCode = 0): int\|false`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`134`	`134`
`135`	`135`	`public function getSubscribedSignals(): array`
`136`	`136`	`{`
`137`		`- return $this->signals ?? (\defined('SIGTERM') ? [\SIGTERM, \SIGINT] : []);`
	`137`	`+ return $this->signals ?? (\extension_loaded('pcntl') ? [\SIGTERM, \SIGINT] : []);`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`public function handleSignal(int $signal, int\|false $previousExitCode = 0): int\|false`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class StopWorkerOnSignalsListener implements EventSubscriberInterface`
`26`	`26`
`27`	`27`	`public function __construct(array $signals = null, LoggerInterface $logger = null)`
`28`	`28`	`{`
`29`		`- if (null === $signals && \defined('SIGTERM')) {`
	`29`	`+ if (null === $signals && \extension_loaded('pcntl')) {`
`30`	`30`	`$signals = [SIGTERM, SIGINT];`
`31`	`31`	`}`
`32`	`32`	`$this->signals = $signals ?? [];`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ class StopWorkerOnSigtermSignalListener extends StopWorkerOnSignalsListener`
`24`	`24`	`{`
`25`	`25`	`public function __construct(LoggerInterface $logger = null)`
`26`	`26`	`{`
`27`		`- parent::__construct(\defined('SIGTERM') ? [SIGTERM] : [], $logger);`
	`27`	`+ parent::__construct(\extension_loaded('pcntl') ? [SIGTERM] : [], $logger);`
`28`	`28`	`}`
`29`	`29`	`}`