Address code review suggestions

roadrunner-php · Jan 13, 2025 · 1276246 · 1276246
1 parent a7e813f
commit 1276246
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -77,11 +77,6 @@
     "config": {
         "sort-packages": true
     },
-    "extra": {
-        "branch-alias": {
-            "3.x": "3.4.x-dev"
-        }
-    },
     "minimum-stability": "dev",
     "prefer-stable": true
 }
diff --git a/src/Internal/CallContext.php b/src/Internal/CallContext.php
@@ -18,9 +18,9 @@ final class CallContext
      * @param array<string, array<string>> $context
      */
     public function __construct(
-        public string $service,
-        public string $method,
-        public array $context,
+        public readonly string $service,
+        public readonly string $method,
+        public readonly array $context,
     ) {
     }
 

diff --git a/src/Server.php b/src/Server.php
@@ -88,22 +88,21 @@ public function serve(?WorkerInterface $worker = null, ?callable $finalize = nul
 
                 $response = $this->invoke($call->service, $call->method, $context, $request->body);
 
-                $headers = array_filter([
-                    'headers' => $responseHeaders->count() ? $responseHeaders->packHeaders() : null,
-                    'trailers' => $responseTrailers->count() ? $responseTrailers->packTrailers() : null,
-                ]);
+                $headers = [];
+                $responseHeaders->count() === 0 or $headers['headers'] = $responseHeaders->packHeaders();
+                $responseTrailers->count() === 0 or $headers['trailers'] = $responseTrailers->packTrailers();
 
                 $this->workerSend(
                     worker: $worker,
                     body: $response,
-                    headers: !empty($headers) ? Json::encode($headers) : '{}',
+                    headers: $headers === [] ? '{}' : Json::encode($headers),
                 );
             } catch (GRPCExceptionInterface $e) {
-                $headers = array_filter([
+                $headers = [
                     'error' => $this->createGrpcError($e),
-                    'headers' => $responseHeaders->count() ? $responseHeaders->packHeaders() : null,
-                    'trailers' => $responseTrailers->count() ? $responseTrailers->packTrailers() : null,
-                ]);
+                ];
+                $responseHeaders->count() === 0 or $headers['headers'] = $responseHeaders->packHeaders();
+                $responseTrailers->count() === 0 or $headers['trailers'] = $responseTrailers->packTrailers();
 
                 $this->workerSend(
                     worker: $worker,