feat: throw better exception for empty request body (GoogleCloudPlatform#35)

bshaffer · web-flow · commit a316105f99a6 · 2020-06-15T11:31:52.000-07:00
diff --git a/src/BackgroundFunctionWrapper.php b/src/BackgroundFunctionWrapper.php
@@ -31,9 +31,13 @@ public function __construct(callable $function)
 
     public function execute(ServerRequestInterface $request): ResponseInterface
     {
-        $event = json_decode((string) $request->getBody(), true);
+        $body = (string) $request->getBody();
+        $event = json_decode($body, true);
         if (json_last_error() != JSON_ERROR_NONE) {
-            throw new RuntimeException('Could not parse request body: ' . json_last_error_msg());
+            throw new RuntimeException(sprintf(
+                'Could not parse request body: %s',
+                '' !== $body ? json_last_error_msg() : 'Missing event payload'
+            ));
         }
 
         $data = $event['data'];
diff --git a/tests/BackgroundFunctionWrapperTest.php b/tests/BackgroundFunctionWrapperTest.php
@@ -32,9 +32,19 @@ class BackgroundFunctionWrapperTest extends TestCase
     public function testInvalidRequestBody()
     {
         $this->expectException('RuntimeException');
-        $this->expectExceptionMessage('Could not parse request body');
+        $this->expectExceptionMessage('Could not parse request body: Syntax error');
+        $request = new ServerRequest('GET', '/', [], 'notjson');
         $backgroundFunctionWrapper = new BackgroundFunctionWrapper([$this, 'invokeThis']);
-        $backgroundFunctionWrapper->execute(new ServerRequest('GET', '/'));
+        $backgroundFunctionWrapper->execute($request);
+    }
+
+    public function testEmptyRequestBody()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('Could not parse request body: Missing event payload');
+        $request = new ServerRequest('GET', '/', [], '');
+        $backgroundFunctionWrapper = new BackgroundFunctionWrapper([$this, 'invokeThis']);
+        $backgroundFunctionWrapper->execute($request);
     }
 
     public function testHttpBackgroundFunctionWrapper()

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,13 @@ public function __construct(callable $function)`
`31`	`31`
`32`	`32`	`public function execute(ServerRequestInterface $request): ResponseInterface`
`33`	`33`	`{`
`34`		`- $event = json_decode((string) $request->getBody(), true);`
	`34`	`+ $body = (string) $request->getBody();`
	`35`	`+ $event = json_decode($body, true);`
`35`	`36`	`if (json_last_error() != JSON_ERROR_NONE) {`
`36`		`- throw new RuntimeException('Could not parse request body: ' . json_last_error_msg());`
	`37`	`+ throw new RuntimeException(sprintf(`
	`38`	`+ 'Could not parse request body: %s',`
	`39`	`+ '' !== $body ? json_last_error_msg() : 'Missing event payload'`
	`40`	`+ ));`
`37`	`41`	`}`
`38`	`42`
`39`	`43`	`$data = $event['data'];`