Merge pull request #1134 from hydephp/clean-up-the-serve-command-class

emmadesilva · web-flow · commit dbbb73a62fb8 · 2023-02-27T18:58:46.000+01:00
Clean up the serve command class
diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Console\Commands;
 
-use Illuminate\Support\Facades\Process;
-use function config;
 use Hyde\Hyde;
+use Hyde\Facades\Config;
+use Illuminate\Support\Facades\Process;
 use LaravelZero\Framework\Commands\Command;
 use function sprintf;
 
@@ -28,8 +28,8 @@ public function handle(): int
         $this->line('<info>Starting the HydeRC server...</info> Press Ctrl+C to stop');
 
         $this->runServerProcess(sprintf('php -S %s:%d %s',
-            $this->getHostSelection() ?: 'localhost',
-            $this->getPortSelection() ?: 8080,
+            $this->getHostSelection(),
+            $this->getPortSelection(),
             $this->getExecutablePath()
         ));
 
@@ -38,22 +38,23 @@ public function handle(): int
 
     protected function getPortSelection(): int
     {
-        return (int) ($this->option('port') ?: config('hyde.server.port', 8080));
+        return (int) ($this->option('port') ?: Config::getInt('hyde.server.port', 8080));
     }
 
     protected function getHostSelection(): string
     {
-        return $this->option('host') ?: config('hyde.server.host', 'localhost');
+        return (string) $this->option('host') ?: Config::getString('hyde.server.host', 'localhost');
     }
 
     protected function getExecutablePath(): string
     {
         return Hyde::path('vendor/hyde/realtime-compiler/bin/server.php');
     }
 
+    /** @codeCoverageIgnore Until output is testable */
     protected function runServerProcess(string $command): void
     {
-        Process::run($command, function ($type, $line) {
+        Process::run($command, function (string $type, string $line): void {
             $this->output->write($line);
         });
     }
diff --git a/packages/framework/tests/Feature/Commands/ServeCommandTest.php b/packages/framework/tests/Feature/Commands/ServeCommandTest.php
@@ -7,6 +7,7 @@
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Process;
+use TypeError;
 
 /**
  * @covers \Hyde\Console\Commands\ServeCommand
@@ -124,11 +125,24 @@ public function test_hyde_serve_command_with_host_missing_in_config_and_host_opt
 
     public function test_hyde_serve_command_with_invalid_config_value()
     {
+        $this->expectException(TypeError::class);
         config(['hyde.server.port' => 'foo']);
 
         $this->artisan('serve')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
             ->assertExitCode(0);
+    }
+
+    public function test_hyde_serve_command_passes_through_process_output()
+    {
+        $this->markTestSkipped('Unable to access the output of the process. Assuming vendor bug for now.');
+
+        Process::fake(['php -S localhost:8080 {$this->binaryPath()}' => 'foo']);
+
+        $this->artisan('serve')
+            ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
+            ->expectsOutput('foo')
+            ->assertExitCode(0);
 
         Process::assertRan("php -S localhost:8080 {$this->binaryPath()}");
     }

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`
`5`	`5`	`namespace Hyde\Console\Commands;`
`6`	`6`
`7`		`-use Illuminate\Support\Facades\Process;`
`8`		`-use function config;`
`9`	`7`	`use Hyde\Hyde;`
	`8`	`+use Hyde\Facades\Config;`
	`9`	`+use Illuminate\Support\Facades\Process;`
`10`	`10`	`use LaravelZero\Framework\Commands\Command;`
`11`	`11`	`use function sprintf;`
`12`	`12`
`@@ -28,8 +28,8 @@ public function handle(): int`
`28`	`28`	`$this->line('<info>Starting the HydeRC server...</info> Press Ctrl+C to stop');`
`29`	`29`
`30`	`30`	`$this->runServerProcess(sprintf('php -S %s:%d %s',`
`31`		`- $this->getHostSelection() ?: 'localhost',`
`32`		`- $this->getPortSelection() ?: 8080,`
	`31`	`+ $this->getHostSelection(),`
	`32`	`+ $this->getPortSelection(),`
`33`	`33`	`$this->getExecutablePath()`
`34`	`34`	`));`
`35`	`35`
`@@ -38,22 +38,23 @@ public function handle(): int`
`38`	`38`
`39`	`39`	`protected function getPortSelection(): int`
`40`	`40`	`{`
`41`		`- return (int) ($this->option('port') ?: config('hyde.server.port', 8080));`
	`41`	`+ return (int) ($this->option('port') ?: Config::getInt('hyde.server.port', 8080));`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`protected function getHostSelection(): string`
`45`	`45`	`{`
`46`		`- return $this->option('host') ?: config('hyde.server.host', 'localhost');`
	`46`	`+ return (string) $this->option('host') ?: Config::getString('hyde.server.host', 'localhost');`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`protected function getExecutablePath(): string`
`50`	`50`	`{`
`51`	`51`	`return Hyde::path('vendor/hyde/realtime-compiler/bin/server.php');`
`52`	`52`	`}`
`53`	`53`
	`54`	`+ /** @codeCoverageIgnore Until output is testable */`
`54`	`55`	`protected function runServerProcess(string $command): void`
`55`	`56`	`{`
`56`		`- Process::run($command, function ($type, $line) {`
	`57`	`+ Process::run($command, function (string $type, string $line): void {`
`57`	`58`	`$this->output->write($line);`
`58`	`59`	`});`
`59`	`60`	`}`