diff --git a/Application.php b/Application.php
index 4ce5022a3..c388427b7 100644
--- a/Application.php
+++ b/Application.php
@@ -957,22 +957,30 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
}
}
- if ($command instanceof SignalableCommandInterface && ($this->signalsToDispatchEvent || $command->getSubscribedSignals())) {
- if (!$this->signalRegistry) {
- throw new RuntimeException('Unable to subscribe to signal events. Make sure that the `pcntl` extension is installed and that "pcntl_*" functions are not disabled by your php.ini\'s "disable_functions" directive.');
- }
+ if ($this->signalsToDispatchEvent) {
+ $commandSignals = $command instanceof SignalableCommandInterface ? $command->getSubscribedSignals() : [];
- if (Terminal::hasSttyAvailable()) {
- $sttyMode = shell_exec('stty -g');
+ if ($commandSignals || null !== $this->dispatcher) {
+ if (!$this->signalRegistry) {
+ throw new RuntimeException('Unable to subscribe to signal events. Make sure that the `pcntl` extension is installed and that "pcntl_*" functions are not disabled by your php.ini\'s "disable_functions" directive.');
+ }
- foreach ([\SIGINT, \SIGTERM] as $signal) {
- $this->signalRegistry->register($signal, static function () use ($sttyMode) {
- shell_exec('stty '.$sttyMode);
- });
+ if (Terminal::hasSttyAvailable()) {
+ $sttyMode = shell_exec('stty -g');
+
+ foreach ([\SIGINT, \SIGTERM] as $signal) {
+ $this->signalRegistry->register($signal, static function () use ($sttyMode) {
+ shell_exec('stty '.$sttyMode);
+ });
+ }
+ }
+
+ foreach ($commandSignals as $signal) {
+ $this->signalRegistry->register($signal, [$command, 'handleSignal']);
}
}
- if ($this->dispatcher) {
+ if (null !== $this->dispatcher) {
foreach ($this->signalsToDispatchEvent as $signal) {
$event = new ConsoleSignalEvent($command, $input, $output, $signal);
@@ -988,10 +996,6 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
});
}
}
-
- foreach ($command->getSubscribedSignals() as $signal) {
- $this->signalRegistry->register($signal, [$command, 'handleSignal']);
- }
}
if (null === $this->dispatcher) {
diff --git a/Descriptor/ApplicationDescription.php b/Descriptor/ApplicationDescription.php
index 0802f1b38..2fd311a4f 100644
--- a/Descriptor/ApplicationDescription.php
+++ b/Descriptor/ApplicationDescription.php
@@ -127,7 +127,7 @@ private function sortCommands(array $commands): array
}
if ($namespacedCommands) {
- ksort($namespacedCommands);
+ ksort($namespacedCommands, \SORT_STRING);
foreach ($namespacedCommands as $key => $commandsSet) {
ksort($commandsSet);
$sortedCommands[$key] = $commandsSet;
diff --git a/Formatter/OutputFormatterStyleStack.php b/Formatter/OutputFormatterStyleStack.php
index b425449ef..66f86a5f7 100644
--- a/Formatter/OutputFormatterStyleStack.php
+++ b/Formatter/OutputFormatterStyleStack.php
@@ -77,7 +77,7 @@ public function pop(OutputFormatterStyleInterface $style = null): OutputFormatte
/**
* Computes current style with stacks top codes.
*/
- public function getCurrent(): OutputFormatterStyle
+ public function getCurrent(): OutputFormatterStyleInterface
{
if (empty($this->styles)) {
return $this->emptyStyle;
diff --git a/Tests/ApplicationTest.php b/Tests/ApplicationTest.php
index 307c01794..70e54870b 100644
--- a/Tests/ApplicationTest.php
+++ b/Tests/ApplicationTest.php
@@ -21,6 +21,7 @@
use Symfony\Component\Console\DependencyInjection\AddConsoleCommandPass;
use Symfony\Component\Console\Event\ConsoleCommandEvent;
use Symfony\Component\Console\Event\ConsoleErrorEvent;
+use Symfony\Component\Console\Event\ConsoleSignalEvent;
use Symfony\Component\Console\Event\ConsoleTerminateEvent;
use Symfony\Component\Console\Exception\CommandNotFoundException;
use Symfony\Component\Console\Exception\NamespaceNotFoundException;
@@ -42,6 +43,8 @@
use Symfony\Component\Console\Tester\ApplicationTester;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\Process\Process;
class ApplicationTest extends TestCase
@@ -1862,9 +1865,9 @@ public function testCommandNameMismatchWithCommandLoaderKeyThrows()
/**
* @requires extension pcntl
*/
- public function testSignal()
+ public function testSignalListenerNotCalledByDefault()
{
- $command = new SignableCommand();
+ $command = new SignableCommand(false);
$dispatcherCalled = false;
$dispatcher = new EventDispatcher();
@@ -1872,29 +1875,97 @@ public function testSignal()
$dispatcherCalled = true;
});
- $application = new Application();
- $application->setAutoExit(false);
- $application->setDispatcher($dispatcher);
- $application->setSignalsToDispatchEvent(\SIGALRM);
- $application->add(new LazyCommand('signal', [], '', false, function () use ($command) { return $command; }, true));
-
- $this->assertFalse($command->signaled);
- $this->assertFalse($dispatcherCalled);
+ $application = $this->createSignalableApplication($command, $dispatcher);
$this->assertSame(0, $application->run(new ArrayInput(['signal'])));
$this->assertFalse($command->signaled);
$this->assertFalse($dispatcherCalled);
+ }
+
+ /**
+ * @requires extension pcntl
+ */
+ public function testSignalListener()
+ {
+ $command = new SignableCommand();
+
+ $dispatcherCalled = false;
+ $dispatcher = new EventDispatcher();
+ $dispatcher->addListener('console.signal', function () use (&$dispatcherCalled) {
+ $dispatcherCalled = true;
+ });
+
+ $application = $this->createSignalableApplication($command, $dispatcher);
- $command->loop = 100000;
- pcntl_alarm(1);
$this->assertSame(1, $application->run(new ArrayInput(['signal'])));
- $this->assertTrue($command->signaled);
$this->assertTrue($dispatcherCalled);
+ $this->assertTrue($command->signaled);
+ }
+
+ /**
+ * @requires extension pcntl
+ */
+ public function testSignalSubscriberNotCalledByDefault()
+ {
+ $command = new BaseSignableCommand(false);
+
+ $subscriber = new SignalEventSubscriber();
+ $dispatcher = new EventDispatcher();
+ $dispatcher->addSubscriber($subscriber);
+
+ $application = $this->createSignalableApplication($command, $dispatcher);
+
+ $this->assertSame(0, $application->run(new ArrayInput(['signal'])));
+ $this->assertFalse($subscriber->signaled);
+ }
+
+ /**
+ * @requires extension pcntl
+ */
+ public function testSignalSubscriber()
+ {
+ $command = new BaseSignableCommand();
+
+ $subscriber1 = new SignalEventSubscriber();
+ $subscriber2 = new SignalEventSubscriber();
+
+ $dispatcher = new EventDispatcher();
+ $dispatcher->addSubscriber($subscriber1);
+ $dispatcher->addSubscriber($subscriber2);
+
+ $application = $this->createSignalableApplication($command, $dispatcher);
+
+ $this->assertSame(1, $application->run(new ArrayInput(['signal'])));
+ $this->assertTrue($subscriber1->signaled);
+ $this->assertTrue($subscriber2->signaled);
+ }
+
+ /**
+ * @requires extension pcntl
+ */
+ public function testSetSignalsToDispatchEvent()
+ {
+ $command = new BaseSignableCommand();
+
+ $subscriber = new SignalEventSubscriber();
+
+ $dispatcher = new EventDispatcher();
+ $dispatcher->addSubscriber($subscriber);
+
+ $application = $this->createSignalableApplication($command, $dispatcher);
+ $application->setSignalsToDispatchEvent(\SIGUSR2);
+ $this->assertSame(0, $application->run(new ArrayInput(['signal'])));
+ $this->assertFalse($subscriber->signaled);
+
+ $application = $this->createSignalableApplication($command, $dispatcher);
+ $application->setSignalsToDispatchEvent(\SIGUSR1);
+ $this->assertSame(1, $application->run(new ArrayInput(['signal'])));
+ $this->assertTrue($subscriber->signaled);
}
public function testSignalableCommandInterfaceWithoutSignals()
{
- $command = new SignableCommand();
+ $command = new SignableCommand(false);
$dispatcher = new EventDispatcher();
$application = new Application();
@@ -1936,6 +2007,18 @@ public function testSignalableRestoresStty()
$this->assertSame($previousSttyMode, $sttyMode);
}
+
+ private function createSignalableApplication(Command $command, ?EventDispatcherInterface $dispatcher): Application
+ {
+ $application = new Application();
+ $application->setAutoExit(false);
+ if ($dispatcher) {
+ $application->setDispatcher($dispatcher);
+ }
+ $application->add(new LazyCommand('signal', [], '', false, function () use ($command) { return $command; }, true));
+
+ return $application;
+ }
}
class CustomApplication extends Application
@@ -1987,25 +2070,26 @@ public function isEnabled(): bool
}
}
-class SignableCommand extends Command implements SignalableCommandInterface
+class BaseSignableCommand extends Command
{
public $signaled = false;
- public $loop = 100;
+ public $loop = 1000;
+ private $emitsSignal;
protected static $defaultName = 'signal';
- public function getSubscribedSignals(): array
+ public function __construct(bool $emitsSignal = true)
{
- return SignalRegistry::isSupported() ? [\SIGALRM] : [];
- }
-
- public function handleSignal(int $signal): void
- {
- $this->signaled = true;
+ parent::__construct();
+ $this->emitsSignal = $emitsSignal;
}
protected function execute(InputInterface $input, OutputInterface $output): int
{
+ if ($this->emitsSignal) {
+ posix_kill(posix_getpid(), SIGUSR1);
+ }
+
for ($i = 0; $i < $this->loop; ++$i) {
usleep(100);
if ($this->signaled) {
@@ -2016,3 +2100,34 @@ protected function execute(InputInterface $input, OutputInterface $output): int
return 0;
}
}
+
+class SignableCommand extends BaseSignableCommand implements SignalableCommandInterface
+{
+ protected static $defaultName = 'signal';
+
+ public function getSubscribedSignals(): array
+ {
+ return SignalRegistry::isSupported() ? [\SIGUSR1] : [];
+ }
+
+ public function handleSignal(int $signal): void
+ {
+ $this->signaled = true;
+ }
+}
+
+class SignalEventSubscriber implements EventSubscriberInterface
+{
+ public $signaled = false;
+
+ public function onSignal(ConsoleSignalEvent $event): void
+ {
+ $this->signaled = true;
+ $event->getCommand()->signaled = true;
+ }
+
+ public static function getSubscribedEvents(): array
+ {
+ return ['console.signal' => 'onSignal'];
+ }
+}
diff --git a/Tests/Descriptor/ApplicationDescriptionTest.php b/Tests/Descriptor/ApplicationDescriptionTest.php
index b3ba9d848..da64dca00 100644
--- a/Tests/Descriptor/ApplicationDescriptionTest.php
+++ b/Tests/Descriptor/ApplicationDescriptionTest.php
@@ -36,7 +36,7 @@ public function getNamespacesProvider()
return [
[['_global'], ['foobar']],
[['a', 'b'], ['b:foo', 'a:foo', 'b:bar']],
- [['_global', 'b', 'z', 22, 33], ['z:foo', '1', '33:foo', 'b:foo', '22:foo:bar']],
+ [['_global', 22, 33, 'b', 'z'], ['z:foo', '1', '33:foo', 'b:foo', '22:foo:bar']],
];
}
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy