[2.x] Adds --admin-port (#790)

* Adds `--admin-port` * Update StartCommand.php --------- Co-authored-by: Taylor Otwell <[email protected]>
laravel · Dec 21, 2023 · 6a625a8 · francislavoie · Dec 21, 2023 · 6a625a8
1 parent de6e59b
commit 6a625a8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Commands/StartCommand.php b/src/Commands/StartCommand.php
@@ -17,6 +17,7 @@ class StartCommand extends Command implements SignalableCommandInterface
                     {--server= : The server that should be used to serve the application}
                     {--host= : The IP address the server should bind to}
                     {--port= : The port the server should be available on [default: "8000"]}
+                    {--admin-port= : The port the admin server should be available on [FrankenPHP only]}
                     {--rpc-host= : The RPC IP address the server should bind to}
                     {--rpc-port= : The RPC port the server should be available on}
                     {--workers=auto : The number of workers that should be available to handle requests}
@@ -102,6 +103,7 @@ protected function startFrankenPhpServer()
         return $this->call('octane:frankenphp', [
             '--host' => $this->getHost(),
             '--port' => $this->getPort(),
+            '--admin-port' => $this->option('admin-port'),
             '--workers' => $this->option('workers'),
             '--max-requests' => $this->option('max-requests'),
             '--caddyfile' => $this->option('caddyfile'),

diff --git a/src/Commands/StartFrankenPhpCommand.php b/src/Commands/StartFrankenPhpCommand.php
@@ -25,6 +25,7 @@ class StartFrankenPhpCommand extends Command implements SignalableCommandInterfa
     public $signature = 'octane:frankenphp
                     {--host=127.0.0.1 : The IP address the server should bind to}
                     {--port= : The port the server should be available on}
+                    {--admin-port= : The port the admin server should be available on}
                     {--workers=auto : The number of workers that should be available to handle requests}
                     {--max-requests=500 : The number of requests to process before reloading the server}
                     {--caddyfile= : The path to the FrankenPHP Caddyfile file}
@@ -216,9 +217,19 @@ protected function writeServerStateFile(
      */
     protected function adminPort()
     {
+        if ($this->option('admin-port')) {
+            return (int) $this->option('admin-port');
+        }
+
         $defaultPort = 2019;
 
-        return $defaultPort + ($this->getPort() - 8000);
+        return tap($defaultPort + ($this->getPort() - 8000), function ($adminPort) {
+            if ($adminPort < 0) {
+                throw new InvalidArgumentException(
+                    'Unable to determine admin port. Please specify the [--admin-port] option.',
+                );
+            }
+        });
     }
 
     /**