StartedServer.php Renamed to RunningServer.php

StartedServerInterface.php removed
Process logs can be forwarded to console
ServerInterface::start() now returns an instance of RunningServer

Author: ahmard

bin/react.php

@@ -14,4 +14,7 @@
 
 $socket = new SocketServer("{$serverInfo->getHost()}:{$serverInfo->getPort()}");
 $http = new HttpServer($serverInfo->getRequestCallback());
+
+echo "Server started";
+
 $http->listen($socket);

composer.json

@@ -7,7 +7,8 @@
         "php": "^8.0",
         "react/child-process": "^0.6.3",
         "react/http": "^1.5",
-        "opis/closure": "^3.6"
+        "opis/closure": "^3.6",
+        "symfony/console": "^5.3"
     },
     "require-dev": {
         "phpstan/phpstan": "^0.12.98",
@@ -24,5 +25,9 @@
             "name": "ahmard",
             "email": "ahmard06@gmail.com"
         }
-    ]
+    ],
+    "scripts": {
+        "analyse": "phpstan analyse",
+        "analyze": "@analyse"
+    }
 }

phpstan.neon

@@ -0,0 +1,8 @@
+parameters:
+    level: 6
+    checkMissingIterableValueType: false
+    paths:
+        - bin
+        - src
+    ignoreErrors:
+        - '#Attribute class JetBrains.* does not exist\.#'

src/BuiltIn/Server.php

@@ -8,8 +8,7 @@
 use PHPServer\ServerInfo;
 use PHPServer\ServerInterface;
 use PHPServer\ServerProcess;
-use PHPServer\StartedServer;
-use PHPServer\StartedServerInterface;
+use PHPServer\RunningServer;
 use PHPServer\Terminal;
 use function PHPServer\base_path;
 
@@ -29,7 +28,7 @@ public function __construct(
 
     #[Pure] public static function create(string $host, int $port): static
     {
-        return new Server($host, $port);
+        return new static($host, $port);
     }
 
     public function getCommand(): ServerCommand
@@ -88,8 +87,8 @@ public function onRequest(callable $callback): static
         return $this;
     }
 
-    public function start(): StartedServerInterface
+    public function start(): RunningServer
     {
-        return new StartedServer($this, ServerProcess::create($this));
+        return new RunningServer($this, ServerProcess::create($this));
     }
 }

src/React/Server.php

@@ -8,8 +8,7 @@
 use PHPServer\ServerInfo;
 use PHPServer\ServerInterface;
 use PHPServer\ServerProcess;
-use PHPServer\StartedServer;
-use PHPServer\StartedServerInterface;
+use PHPServer\RunningServer;
 use PHPServer\Terminal;
 use function PHPServer\base_path;
 
@@ -28,7 +27,7 @@ public function __construct(
 
     #[Pure] public static function create(string $host, int $port): static
     {
-        return new Server($host, $port);
+        return new static($host, $port);
     }
 
     public function setDocumentRoot(string $path): static
@@ -43,9 +42,9 @@ public function onRequest(callable $callback): static
         return $this;
     }
 
-    public function start(): StartedServerInterface
+    public function start(): RunningServer
     {
-        return new StartedServer($this, ServerProcess::create($this));
+        return new RunningServer($this, ServerProcess::create($this));
     }
 
     public function getCommand(): ServerCommand

src/StartedServer.php src/RunningServer.phpsrc/StartedServer.php renamed to src/RunningServer.php

@@ -3,8 +3,9 @@
 namespace PHPServer;
 
 use React\ChildProcess\Process;
+use React\Stream\WritableResourceStream;
 
-class StartedServer implements StartedServerInterface
+class RunningServer
 {
     public function __construct(
         protected ServerInterface $server,
@@ -13,6 +14,17 @@ public function __construct(
     {
     }
 
+    public function logOutputToConsole(): static
+    {
+        $stdout = new WritableResourceStream(STDOUT);
+        $stderr = new WritableResourceStream(STDERR);
+
+        $this->getProcess()->stdout->pipe($stdout);
+        $this->getProcess()->stderr->pipe($stderr);
+
+        return $this;
+    }
+
     /**
      * @return Process
      */

src/ServerInfo.php

@@ -15,9 +15,9 @@ class ServerInfo
     protected Closure|null $requestCallback = null;
 
 
-    #[Pure] public static function create(): static
+    #[Pure] public static function create(): ServerInfo
     {
-        return new static();
+        return new ServerInfo();
     }
 
     /**
@@ -32,7 +32,7 @@ public function getHost(): string
      * @param string $host
      * @return ServerInfo
      */
-    public function setHost(string $host): static
+    public function setHost(string $host): ServerInfo
     {
         $this->host = $host;
         return $this;
@@ -50,7 +50,7 @@ public function getPort(): int
      * @param int $port
      * @return ServerInfo
      */
-    public function setPort(int $port): static
+    public function setPort(int $port): ServerInfo
     {
         $this->port = $port;
         return $this;
@@ -68,7 +68,7 @@ public function getDocumentRoot(): ?string
      * @param string|null $documentRoot
      * @return ServerInfo
      */
-    public function setDocumentRoot(?string $documentRoot): static
+    public function setDocumentRoot(?string $documentRoot): ServerInfo
     {
         $this->documentRoot = $documentRoot;
         return $this;
@@ -86,7 +86,7 @@ public function getRouterScript(): ?string
      * @param string|null $routerScript
      * @return ServerInfo
      */
-    public function setRouterScript(?string $routerScript): static
+    public function setRouterScript(?string $routerScript): ServerInfo
     {
         $this->routerScript = $routerScript;
         return $this;
@@ -104,7 +104,7 @@ public function getRequestCallback(): ?Closure
      * @param Closure|null $requestCallback
      * @return ServerInfo
      */
-    public function setRequestCallback(?Closure $requestCallback): static
+    public function setRequestCallback(?Closure $requestCallback): ServerInfo
     {
         $this->requestCallback = $requestCallback;
         return $this;

src/ServerInterface.php

@@ -12,7 +12,7 @@ public function setDocumentRoot(string $path): static;
 
     public function onRequest(callable $callback): static;
 
-    public function start(): StartedServerInterface;
+    public function start(): RunningServer;
 
     public function getCommand(): ServerCommand;
 

src/ServerProcess.php

@@ -11,19 +11,9 @@ public static function create(ServerInterface $server): Process
     {
         $command = self::constructCommand($server->getCommand());
 
-        var_dump(exec($command));
-        die;
-        $process = new Process('echo foo');
+        $process = new Process($command);
         $process->start();
 
-        $process->stdout->on('data', function ($chunk) {
-            // echo $chunk;
-        });
-
-        $process->on('exit', function ($exitCode, $termSignal) {
-            //echo 'Process exited with code ' . $exitCode . PHP_EOL;
-        });
-
         return $process;
     }
 

src/StartedServerInterface.php

@@ -6,6 +6,8 @@
 
 interface StartedServerInterface
 {
+    public function logOutputToConsole(): static;
+
     public function getProcess(): Process;
 
     public function getServer(): ServerInterface;