Optimize the code to reduce redundancy

Author: matyhtf

src/core/RemoteObject/Context.php

@@ -34,12 +34,8 @@ public function __construct(Request $request, Response $response)
 
     public function end(array $data): void
     {
-        $resp = serialize($data);
-        if (!$resp) {
-            throw new Exception('json_encode error, Error: ' . json_last_error_msg());
-        }
         $this->response->header('Content-Type', 'application/octet-stream');
-        $this->response->end($resp);
+        $this->response->end(serialize($data));
     }
 
     public function getHandler(): string
@@ -48,13 +44,17 @@ public function getHandler(): string
         return str_replace('/', '_', $path);
     }
 
-    public function getParam(string $name, bool $required = true, $default = null): string
+    public function getParam(string $name): string
     {
-        $value = $this->request->post[$name] ?? $default;
-        if ($required and $value === null) {
+        if (!isset($this->request->post[$name])) {
             throw new Exception("param[{$name}] is empty");
         }
-        return $value;
+        return $this->request->post[$name];
+    }
+
+    public function getDataParam(string $name): mixed
+    {
+        return unserialize($this->getParam($name));
     }
 
     public function getCoroutineId(): int

src/core/RemoteObject/Server.php

@@ -145,7 +145,7 @@ private function _new(Context $ctx): void
             throw new Exception("class[{$class}] not allowed");
         }
         $class = '\\' . $class;
-        $args  = unserialize($ctx->getParam('args'));
+        $args  = $ctx->getDataParam('args');
         foreach ($args as $key => $value) {
             $args[$key] = $this->unmarshal($value);
         }
@@ -160,7 +160,7 @@ private function _call_function(Context $ctx): void
         if (count($this->allowedFunctions) > 0 and !isset($this->allowedFunctions[$fn])) {
             throw new Exception("function[{$fn}] not allowed");
         }
-        $args = unserialize($ctx->getParam('args'));
+        $args = $ctx->getDataParam('args');
         foreach ($args as $key => $value) {
             $args[$key] = $this->unmarshal($value);
         }
@@ -182,7 +182,7 @@ private function _call_method(Context $ctx): void
             throw new Exception("object[#{$object_id}] not found");
         }
         $method = $ctx->getParam('method');
-        $args   = unserialize($ctx->getParam('args'));
+        $args   = $ctx->getDataParam('args');
         foreach ($args as $key => $value) {
             $args[$key] = $this->unmarshal($value);
         }
@@ -217,7 +217,7 @@ private function _write_property(Context $ctx): void
     {
         $object_id = $ctx->getParam('object');
         $property  = $ctx->getParam('property');
-        $value     = unserialize($ctx->getParam('value'));
+        $value     = $ctx->getDataParam('value');
         if (!isset($this->objects[$object_id])) {
             throw new Exception("object[#{$object_id}] not found");
         }
@@ -265,7 +265,7 @@ private function _offset_set(Context $ctx): void
     {
         $object_id = $ctx->getParam('object');
         $offset    = $ctx->getParam('offset');
-        $value     = unserialize($ctx->getParam('value'));
+        $value     = $ctx->getDataParam('value');
         if (!isset($this->objects[$object_id])) {
             throw new Exception("object[#{$object_id}] not found");
         }

tests/unit/RemoteObjectTest.php

@@ -61,14 +61,14 @@ public function testResource()
     {
         run(function () {
             $client = new RemoteObject\Client('127.0.0.1', RemoteObject\Server::DEFAULT_PORT);
-            $fp = $client->call('fopen', '/tmp/data.txt', 'w');
+            $fp     = $client->call('fopen', '/tmp/data.txt', 'w');
 
-            $n = random_int(1024, 65536);
+            $n     = random_int(1024, 65536);
             $wdata = random_bytes($n);
             $client->call('fwrite', $fp, $wdata);
             $client->call('fclose', $fp);
 
-            $fp = $client->call('fopen', '/tmp/data.txt', 'r');
+            $fp    = $client->call('fopen', '/tmp/data.txt', 'r');
             $rdata = $client->call('fread', $fp, $n);
             $client->call('fclose', $fp);
             $this->assertEquals($wdata, $rdata);