Refresh

Author: greendrake

composer.json

@@ -21,12 +21,12 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=8.2.0",
+        "react/http": "^3@dev",
         "react/promise": "3.x-dev",
-        "react/http": "1.x-dev",
         "react/async": "4.x-dev"
     },
     "require-dev": {
-        "phpunit/phpunit": "10"
+        "phpunit/phpunit": "12"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -1,4 +1,9 @@
-<phpunit colors="true" bootstrap="src/bootstrap.php">
+<phpunit colors="true" bootstrap="src/bootstrap.php"
+        displayDetailsOnTestsThatTriggerDeprecations="true"
+        displayDetailsOnTestsThatTriggerErrors="true"
+        displayDetailsOnTestsThatTriggerNotices="true"
+        displayDetailsOnTestsThatTriggerWarnings="true"
+        displayDetailsOnPhpunitDeprecations="true">
     <testsuites>
         <testsuite name="default">
             <directory>test/</directory>

src/NonZeroExitException.php

@@ -1,6 +1,7 @@
 <?php
 declare (strict_types = 1);
 namespace Greendrake\AsyncProcess;
+
 class NonZeroExitException extends \RuntimeException
 {
-}
+}

src/Promise.php

@@ -1,16 +1,18 @@
 <?php
 declare (strict_types = 1);
 namespace Greendrake\AsyncProcess;
+
 use Ds\Set;
 use function React\Async\await;
 use Psr\Http\Message\RequestInterface as Request;
 use React\Http\Browser;
-use React\Http\Server;
+use React\Http\HttpServer;
 use React\Promise as BasePromise;
 use React\Socket\ConnectionInterface;
 use React\Socket\Server as SocketServer;
 
-class Promise {
+class Promise
+{
 
     protected BasePromise\Deferred $deferred;
     protected BasePromise\Promise $promise;
@@ -19,7 +21,8 @@ class Promise {
     private static $sigHoldHandlerSetup = false;
     private static $sigHoldDefaultHandler;
 
-    public function __construct(protected string $command) {
+    public function __construct(protected string $command)
+    {
         $this->deferred = new BasePromise\Deferred;
         $this->promise = $this->deferred->promise();
         if (!self::$sigHoldHandlerSetup) {
@@ -64,7 +67,7 @@ public function __construct(protected string $command) {
                 });
             });
             // Actually run the one-off HTTP server to wait for what the forked process has to say:
-            $server = new Server(function (Request $request) use (&$result) {
+            $server = new HttpServer(function (Request $request) use (&$result) {
                 $result = unserialize((string) $request->getBody());
             });
             $server->listen($socket);
@@ -74,12 +77,12 @@ public function __construct(protected string $command) {
             pcntl_signal(SIGCHLD, self::$sigHoldDefaultHandler);
             $browser = new Browser;
             // Define the function that will report results back to the parent:
-            $reportBack = function (int $forkExitCode = 0, ?int $jobExitCode = null, ?array $result = null, ?\Throwable $error = null) use ($browser, $httpAddress) {
+            $reportBack = function (int $forkExitCode = 0, ?int $jobExitCode = null, ?array $result = null,  ? \Throwable $error = null) use ($browser, $httpAddress) {
                 await($browser->post('http://' . $httpAddress, [], serialize([
                     'success' => $error === null,
                     'result' => $result,
                     'code' => $jobExitCode,
-                    'error' => $error,
+                    'error' => $error
                 ]))->catch(function () {
                     // Don't give a fuck. This is the forked background process, and if anything is wrong, no one is gonna hear anyway.
                 }));
@@ -127,7 +130,8 @@ public function __construct(protected string $command) {
         }
     }
 
-    public function getPid(): int {
+    public function getPid(): int
+    {
         return $this->pid;
     }
 
@@ -136,7 +140,8 @@ public function get(): BasePromise\PromiseInterface
         return $this->promise;
     }
 
-    private static function findUnusedPort(): int {
+    private static function findUnusedPort(): int
+    {
         $tried = new Set;
         $add = function (int $port) use ($tried) {
             $tried->add($port);
@@ -148,7 +153,8 @@ private static function findUnusedPort(): int {
         return $port;
     }
 
-    private static function isPortOpen(int $port): bool {
+    private static function isPortOpen(int $port): bool
+    {
         $result = false;
         try {
             if ($pf = fsockopen('127.0.0.1', $port)) {
@@ -163,4 +169,4 @@ private static function isPortOpen(int $port): bool {
         return $result;
     }
 
-}
+}

src/bootstrap.php

@@ -2,5 +2,5 @@
 declare (strict_types = 1);
 require_once __DIR__ . '/../vendor/autoload.php';
 set_error_handler(function ($severity, $message, $file, $line) {
-	throw new \ErrorException($message, 0, $severity, $file, $line);
-});
+    throw new \ErrorException($message, 0, $severity, $file, $line);
+});

test/Test.php

@@ -1,21 +1,25 @@
 <?php
 declare (strict_types = 1);
 namespace Greendrake\AsyncProcess;
+
 use function React\Async\await;
 use PHPUnit\Framework\TestCase;
 
-class Test extends TestCase {
+class Test extends TestCase
+{
 
-    public function testFailure() {
+    public function testFailure()
+    {
         $this->expectException(NonZeroExitException::class);
         $p = new Promise('no-bananas');
         await($p->get());
     }
 
-    public function testSuccess() {
+    public function testSuccess()
+    {
         $p = new Promise('a=$( expr 10 - 3 ); echo $a');
         $result = await($p->get());
         $this->assertSame('7', $result);
     }
 
-}
+}