Merge pull request #5 from aws/fix/support-php7-json_decode

jeskew · jeskew · commit c4fa46227321 · 2015-06-26T13:14:16.000-07:00
Squash two errors from `fromRawPostData` into one
diff --git a/src/Message.php b/src/Message.php
@@ -53,9 +53,7 @@ public static function fromRawPostData()
         }
 
         $data = json_decode(file_get_contents('php://input'), true);
-        if (JSON_ERROR_NONE !== json_last_error()) {
-            throw new \InvalidArgumentException('Unable to parse JSON.');
-        } elseif (!is_array($data)) {
+        if (JSON_ERROR_NONE !== json_last_error() || !is_array($data)) {
             throw new \RuntimeException('Invalid POST data.');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,7 @@ public static function fromRawPostData()`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`$data = json_decode(file_get_contents('php://input'), true);`
`56`		`- if (JSON_ERROR_NONE !== json_last_error()) {`
`57`		`- throw new \InvalidArgumentException('Unable to parse JSON.');`
`58`		`- } elseif (!is_array($data)) {`
	`56`	`+ if (JSON_ERROR_NONE !== json_last_error() \|\| !is_array($data)) {`
`59`	`57`	`throw new \RuntimeException('Invalid POST data.');`
`60`	`58`	`}`
`61`	`59`