Replace http server with koriym/php-server

bearsunday · Jul 26, 2023 · d62c50a · d62c50a
1 parent 8f43546
commit d62c50a
Show file tree

Hide file tree

Showing 9 changed files with 240 additions and 148 deletions.
diff --git a/composer.json b/composer.json
@@ -14,11 +14,11 @@
         "aura/sql": "^3 || ^4 || ^5",
         "bear/app-meta": "^1.8",
         "bear/resource": "^1.17",
+        "koriym/php-server": "^1.0",
+        "longxinh/xhprof": "^2.3",
         "psr/log": "^1 || ^2 || ^3",
         "ray/aop": "^2.13",
-        "ray/di": "^2.14",
-        "symfony/process": "^5.2.7",
-        "longxinh/xhprof": "^2.3"
+        "ray/di": "^2.14"
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.4",

diff --git a/src/Http/BuiltinServer.php → src-deprecated/Http/BuiltinServer.php b/src/Http/BuiltinServer.php → src-deprecated/Http/BuiltinServer.php
@@ -6,18 +6,17 @@
 
 use RuntimeException;
 use Symfony\Component\Process\Process;
-
 use function error_log;
 use function is_int;
 use function register_shutdown_function;
 use function sleep;
 use function sprintf;
 use function strpos;
 use function version_compare;
-
 use const PHP_BINARY;
 use const PHP_VERSION;
 
+/** @deprecated User koriym/php-server PhpServer instead */
 final class BuiltinServer
 {
     /**

diff --git a/src-deprecated/Http/BuiltinServerStartTrait.php b/src-deprecated/Http/BuiltinServerStartTrait.php
@@ -7,7 +7,6 @@
 use BEAR\Resource\ResourceInterface;
 use Ray\Di\InjectorInterface;
 use ReflectionClass;
-
 use function dirname;
 use function register_shutdown_function;
 

diff --git a/src/Http/HttpResource.php b/src/Http/HttpResource.php
@@ -9,6 +9,7 @@
 use BEAR\Resource\ResourceInterface;
 use BEAR\Resource\ResourceObject;
 use BEAR\Resource\Uri as ResourceUri;
+use Koriym\PhpServer\PhpServer;
 use LogicException;
 
 use function exec;
@@ -32,7 +33,7 @@ final class HttpResource implements ResourceInterface
     /** @var string */
     private $baseUri;
 
-    /** @var BuiltinServer */
+    /** @var PhpServer */
     private static $server;
 
     /** @var QueryMerger */
@@ -62,7 +63,7 @@ private function startServer(string $host, string $index): void
             return;
         }
 
-        self::$server = new BuiltinServer($host, $index);
+        self::$server = new PhpServer($host, $index);
         self::$server->start();
         $started[] = $id;
     }

diff --git a/tests/Fake/app/composer.json b/tests/Fake/app/composer.json
@@ -16,8 +16,9 @@
         "ray/di": "^2.11"
     },
     "require-dev": {
-        "bear/devtools": "^0.1",
         "bamarni/composer-bin-plugin": "^1.4",
+        "bear/devtools": "^0.1",
+        "koriym/php-server": "^1.0",
         "phpunit/phpunit": "^9.5",
         "roave/security-advisories": "dev-master"
     },

diff --git a/tests/Fake/app/composer.lock b/tests/Fake/app/composer.lock
diff --git a/tests/Fake/app/public-twig/index.php b/tests/Fake/app/public-twig/index.php
@@ -7,4 +7,4 @@
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 require dirname(__DIR__, 4) . '/vendor/autoload.php';
-exit((new Bootstrap())(PHP_SAPI === 'cli-server' ? 'dev-html-app' : 'dev-prod-twig-app', $GLOBALS, $_SERVER));
+exit((new Bootstrap())(PHP_SAPI === 'cli-server' ? 'dev-twig-app' : 'dev-prod-twig-app', $GLOBALS, $_SERVER));
diff --git a/tests/Fake/app/src/Resource/Page/Halo.php b/tests/Fake/app/src/Resource/Page/Halo.php
@@ -6,6 +6,7 @@
 
 use BEAR\Resource\Annotation\Embed;
 use BEAR\Resource\ResourceObject;
+
 class Halo extends ResourceObject
 {
     public $body = [