Ensure json_decode() errors are caught

deviantintegral · deviantintegral · commit 28929cf0c467 · 2021-01-26T13:10:44.000-05:00
diff --git a/composer.json b/composer.json
@@ -18,7 +18,8 @@
         "guzzlehttp/psr7": "^1.6",
         "php-http/client-implementation": "^1.0",
         "psr/http-client": "^1.0",
-        "psr/http-message": "^1.0"
+        "psr/http-message": "^1.0",
+        "symfony/serializer": "^5.2"
     },
     "require-dev": {
         "php-http/mock-client": "^1.3",
diff --git a/src/Entity/Collection/EntityCollection.php b/src/Entity/Collection/EntityCollection.php
@@ -2,8 +2,9 @@
 
 namespace Hussainweb\DrupalApi\Entity\Collection;
 
-use GuzzleHttp\Psr7\Uri;
 use Psr\Http\Message\ResponseInterface;
+use Symfony\Component\Serializer\Encoder\JsonDecode;
+use Symfony\Component\Serializer\Encoder\JsonEncoder;
 
 abstract class EntityCollection implements \Iterator, \Countable
 {
@@ -31,7 +32,7 @@ final public function __construct($data)
      */
     public static function fromResponse(ResponseInterface $response)
     {
-        return new static(json_decode((string) $response->getBody()));
+        return new static((new JsonDecode())->decode((string) $response->getBody(), JsonEncoder::FORMAT));
     }
 
     public function getSelfLink()

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Hussainweb\DrupalApi\Entity\Collection;`
`4`	`4`
`5`		`-use GuzzleHttp\Psr7\Uri;`
`6`	`5`	`use Psr\Http\Message\ResponseInterface;`
	`6`	`+use Symfony\Component\Serializer\Encoder\JsonDecode;`
	`7`	`+use Symfony\Component\Serializer\Encoder\JsonEncoder;`
`7`	`8`
`8`	`9`	`abstract class EntityCollection implements \Iterator, \Countable`
`9`	`10`	`{`
`@@ -31,7 +32,7 @@ final public function __construct($data)`
`31`	`32`	`*/`
`32`	`33`	`public static function fromResponse(ResponseInterface $response)`
`33`	`34`	`{`
`34`		`- return new static(json_decode((string) $response->getBody()));`
	`35`	`+ return new static((new JsonDecode())->decode((string) $response->getBody(), JsonEncoder::FORMAT));`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`public function getSelfLink()`