remove dispatch mode in SignalRegistry

marie · marie · commit 0118e9ccabc6 · 2019-10-01T16:57:44.000+05:00
diff --git a/src/Symfony/Component/SignalRegistry/SignalRegistry.php b/src/Symfony/Component/SignalRegistry/SignalRegistry.php
@@ -6,11 +6,9 @@ final class SignalRegistry implements SignalRegistryInterface
 {
     private $signals = [];
 
-    public function __construct(bool $asynchronousMode = true)
+    public function __construct()
     {
-        if ($asynchronousMode) {
-            pcntl_async_signals(true);
-        }
+        pcntl_async_signals(true);
     }
 
     public function register(int $signal, callable $callback): void
@@ -19,11 +17,6 @@ public function register(int $signal, callable $callback): void
         pcntl_signal($signal, [$this, 'handler']);
     }
 
-    public function dispatch(): bool
-    {
-        return pcntl_signal_dispatch();
-    }
-
     public function handler(int $signal): void
     {
         foreach($this->signals[$signal] as $callback) {
diff --git a/src/Symfony/Component/SignalRegistry/SignalRegistryInterface.php b/src/Symfony/Component/SignalRegistry/SignalRegistryInterface.php
@@ -4,8 +4,7 @@
 
 interface SignalRegistryInterface
 {
-    public function __construct(bool $asynchronousMode = true);
+    public function __construct();
     public function register(int $signal, callable $callback): void;
-    public function dispatch(): bool;
     public function handler(int $signal): void;
 }
diff --git a/src/Symfony/Component/SignalRegistry/Tests/SignalRegistryTest.php b/src/Symfony/Component/SignalRegistry/Tests/SignalRegistryTest.php
@@ -3,6 +3,9 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\SignalRegistry\SignalRegistry;
 
+/**
+ * @requires extension pcntl
+ */
 class SignalRegistryTest  extends TestCase
 {
     public function tearDown(): void
@@ -70,33 +73,4 @@ public function testTwoSignals_AsyncMode_signalsAreHandled()
 
         $this->assertTrue($isHandled2);
     }
-
-    public function testOneCallbackForASignal_DispatchMode_signalIsNotHandled()
-    {
-        $signalRegistry = new SignalRegistry(false);
-
-        $isHandled = false;
-        $signalRegistry->register(SIGUSR1, function() use (&$isHandled) {
-            $isHandled = true;
-        });
-
-        posix_kill(posix_getpid(), SIGUSR1);
-
-        $this->assertFalse($isHandled);
-    }
-
-    public function testOneCallbackForASignal_DispatchMode_signalIsHandled()
-    {
-        $signalRegistry = new SignalRegistry(false);
-
-        $isHandled = false;
-        $signalRegistry->register(SIGUSR1, function() use (&$isHandled) {
-            $isHandled = true;
-        });
-
-        posix_kill(posix_getpid(), SIGUSR1);
-        $signalRegistry->dispatch();
-
-        $this->assertTrue($isHandled);
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,9 @@ final class SignalRegistry implements SignalRegistryInterface`
`6`	`6`	`{`
`7`	`7`	`private $signals = [];`
`8`	`8`
`9`		`- public function __construct(bool $asynchronousMode = true)`
	`9`	`+ public function __construct()`
`10`	`10`	`{`
`11`		`- if ($asynchronousMode) {`
`12`		`- pcntl_async_signals(true);`
`13`		`- }`
	`11`	`+ pcntl_async_signals(true);`
`14`	`12`	`}`
`15`	`13`
`16`	`14`	`public function register(int $signal, callable $callback): void`
`@@ -19,11 +17,6 @@ public function register(int $signal, callable $callback): void`
`19`	`17`	`pcntl_signal($signal, [$this, 'handler']);`
`20`	`18`	`}`
`21`	`19`
`22`		`- public function dispatch(): bool`
`23`		`- {`
`24`		`- return pcntl_signal_dispatch();`
`25`		`- }`
`26`		`-`
`27`	`20`	`public function handler(int $signal): void`
`28`	`21`	`{`
`29`	`22`	`foreach($this->signals[$signal] as $callback) {`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@`
`4`	`4`
`5`	`5`	`interface SignalRegistryInterface`
`6`	`6`	`{`
`7`		`- public function __construct(bool $asynchronousMode = true);`
	`7`	`+ public function __construct();`
`8`	`8`	`public function register(int $signal, callable $callback): void;`
`9`		`- public function dispatch(): bool;`
`10`	`9`	`public function handler(int $signal): void;`
`11`	`10`	`}`