Merge pull request #159 from twirphp/fix-meta-serialization

Fix meta serialization
twirphp · May 17, 2024 · 00bc36b · 00bc36b
2 parents 125fd57 + f7c7877
commit 00bc36b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -38,6 +38,7 @@
             "Tests\\Twirp\\": "lib/tests/",
             "Twirp\\Example\\": "example/src/",
             "": [
+                "example/generated/",
                 "tests/clientcompat/generated/",
                 "tests/complete/generated/",
                 "tests/namespace/generated/"

diff --git a/protoc-gen-twirp_php/templates/service/Server.php.tmpl b/protoc-gen-twirp_php/templates/service/Server.php.tmpl
@@ -331,11 +331,16 @@ final class {{ .Service | phpServiceName .File }}Server implements RequestHandle
             $e = TwirpError::errorFrom($e, 'internal error');
         }
 
-        $body = $this->streamFactory->createStream(json_encode([
+        $rawBody = [
             'code' => $e->getErrorCode(),
             'msg' => $e->getMessage(),
-            'meta' => $e->getMetaMap(),
-        ]));
+        ];
+
+        if (!empty($e->getMetaMap())) {
+            $rawBody['meta'] = $e->getMetaMap();
+        }
+
+        $body = $this->streamFactory->createStream(json_encode($rawBody, \JSON_FORCE_OBJECT));
 
         return $this->responseFactory
             ->createResponse($statusCode)