Replace json_decode with Json::decodeAssociatively

cultuurnet · Aug 8, 2024 · 0c7d36e · 0c7d36e
1 parent 15b8464
commit 0c7d36e
Show file tree

Hide file tree

Showing 18 changed files with 52 additions and 53 deletions.
diff --git a/src/Deserializer/JSONDeserializer.php b/src/Deserializer/JSONDeserializer.php
@@ -4,7 +4,7 @@
 
 namespace CultuurNet\UDB3\Deserializer;
 
-use JsonException;
+use CultuurNet\UDB3\Json;
 
 class JSONDeserializer implements DeserializerInterface
 {
@@ -22,12 +22,10 @@ public function __construct(bool $assoc = false)
      */
     public function deserialize(string $data)
     {
-        $data = json_decode($data, $this->assoc);
-
-        if (null === $data) {
-            throw new JsonException('Invalid JSON');
+        if ($this->assoc) {
+            return Json::decodeAssociatively($data);
         }
 
-        return $data;
+        return Json::decode($data);
     }
 }
diff --git a/src/EventSourcing/DBAL/AggregateAwareDBALEventStore.php b/src/EventSourcing/DBAL/AggregateAwareDBALEventStore.php
@@ -173,8 +173,8 @@ private function deserializeEvent(array $row): DomainMessage
         return new DomainMessage(
             $row['uuid'],
             (int) $row['playhead'],
-            $this->metadataSerializer->deserialize(json_decode($row['metadata'], true)),
-            $this->payloadSerializer->deserialize(json_decode($row['payload'], true)),
+            $this->metadataSerializer->deserialize(Json::decodeAssociatively($row['metadata'])),
+            $this->payloadSerializer->deserialize(Json::decodeAssociatively($row['payload'])),
             DateTime::fromString($row['recorded_on'])
         );
     }

diff --git a/src/EventSourcing/DBAL/EventStream.php b/src/EventSourcing/DBAL/EventStream.php
@@ -9,6 +9,7 @@
 use Broadway\Domain\DomainMessage;
 use Broadway\EventSourcing\EventStreamDecorator;
 use Broadway\Serializer\Serializer;
+use CultuurNet\UDB3\Json;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\Statement;
 use Doctrine\DBAL\DBALException;
@@ -180,8 +181,8 @@ private function deserializeEvent(array $row): DomainMessage
         return new DomainMessage(
             $row['uuid'],
             (int) $row['playhead'],
-            $this->metadataSerializer->deserialize(json_decode($row['metadata'], true)),
-            $this->payloadSerializer->deserialize(json_decode($row['payload'], true)),
+            $this->metadataSerializer->deserialize(Json::decodeAssociatively($row['metadata'])),
+            $this->payloadSerializer->deserialize(Json::decodeAssociatively($row['payload'])),
             DateTime::fromString($row['recorded_on'])
         );
     }

diff --git a/src/Model/Import/DecodedDocument.php b/src/Model/Import/DecodedDocument.php
@@ -4,7 +4,10 @@
 
 namespace CultuurNet\UDB3\Model\Import;
 
+use CultuurNet\UDB3\Json;
 use CultuurNet\UDB3\ReadModel\JsonDocument;
+use InvalidArgumentException;
+use JsonException;
 
 class DecodedDocument
 {
@@ -53,10 +56,10 @@ public function toJsonDocument(): JsonDocument
 
     public static function fromJson(string $id, string $json): self
     {
-        $body = json_decode($json, true);
-
-        if (is_null($body)) {
-            throw new \InvalidArgumentException('The given JSON is not valid and can not be decoded.');
+        try {
+            $body = Json::decodeAssociatively($json);
+        } catch (JsonException $e) {
+            throw new InvalidArgumentException('The given JSON is not valid and can not be decoded.');
         }
 
         return new self($id, $body);

diff --git a/src/Offer/IriOfferIdentifierJSONDeserializer.php b/src/Offer/IriOfferIdentifierJSONDeserializer.php
@@ -6,8 +6,8 @@
 
 use CultuurNet\UDB3\Deserializer\DeserializerInterface;
 use CultuurNet\UDB3\Deserializer\MissingValueException;
+use CultuurNet\UDB3\Json;
 use CultuurNet\UDB3\Model\ValueObject\Web\Url;
-use JsonException;
 
 /**
  * @deprecated
@@ -27,11 +27,7 @@ public function __construct(IriOfferIdentifierFactoryInterface $iriOfferIdentifi
 
     public function deserialize(string $data): IriOfferIdentifier
     {
-        $data = json_decode($data, true);
-
-        if (null === $data) {
-            throw new JsonException('Invalid JSON');
-        }
+        $data = Json::decodeAssociatively($data);
 
         if (!isset($data['@id'])) {
             throw new MissingValueException('Missing property "@id".');

diff --git a/src/Role/ReadModel/Labels/LabelRolesProjector.php b/src/Role/ReadModel/Labels/LabelRolesProjector.php
@@ -62,7 +62,7 @@ private function getDocument(UUID $uuid): ?JsonDocument
      */
     private function getRoleDetails(JsonDocument $document)
     {
-        return json_decode($document->getRawBody(), true);
+        return Json::decodeAssociatively($document->getRawBody());
     }
 
     /**

diff --git a/src/Role/ReadModel/Labels/RoleLabelsProjector.php b/src/Role/ReadModel/Labels/RoleLabelsProjector.php
@@ -127,7 +127,7 @@ private function getDocument(UUID $uuid): ?JsonDocument
      */
     private function getLabelDetails(JsonDocument $document)
     {
-        return json_decode($document->getRawBody(), true);
+        return Json::decodeAssociatively($document->getRawBody());
     }
 
     /**

diff --git a/src/Role/ReadModel/Users/RoleUsersProjector.php b/src/Role/ReadModel/Users/RoleUsersProjector.php
@@ -94,6 +94,6 @@ private function getDocument(UUID $uuid): ?JsonDocument
      */
     private function getUserIdentityDetails(JsonDocument $document): array
     {
-        return json_decode($document->getRawBody(), true);
+        return Json::decodeAssociatively($document->getRawBody());
     }
 }
diff --git a/src/Role/ReadModel/Users/UserRolesProjector.php b/src/Role/ReadModel/Users/UserRolesProjector.php
@@ -54,7 +54,7 @@ public function applyUserAdded(UserAdded $userAdded): void
             );
         }
 
-        $roles = json_decode($document->getRawBody(), true);
+        $roles = Json::decodeAssociatively($document->getRawBody());
         $roles[$roleId] = $roleDetails;
 
         $document = $document->withAssocBody($roles);
@@ -73,7 +73,7 @@ public function applyUserRemoved(UserRemoved $userRemoved): void
             return;
         }
 
-        $roles = json_decode($document->getRawBody(), true);
+        $roles = Json::decodeAssociatively($document->getRawBody());
         unset($roles[$roleId]);
 
         $document = $document->withAssocBody($roles);
@@ -99,13 +99,13 @@ public function applyRoleDetailsProjectedToJSONLD(RoleDetailsProjectedToJSONLD $
 
         $roleDetails = $roleDetailsDocument->getBody();
 
-        $roleUsers = json_decode($roleUsersDocument->getRawBody(), true);
+        $roleUsers = Json::decodeAssociatively($roleUsersDocument->getRawBody());
         $roleUserIds = array_keys($roleUsers);
 
         foreach ($roleUserIds as $roleUserId) {
             $userRolesDocument = $this->repository->fetch($roleUserId);
 
-            $userRoles = json_decode($userRolesDocument->getRawBody(), true);
+            $userRoles = Json::decodeAssociatively($userRolesDocument->getRawBody());
             $userRoles[$roleId] = $roleDetails;
 
             $userRolesDocument = $userRolesDocument->withAssocBody($userRoles);

diff --git a/src/User/Auth0/Auth0ManagementTokenGenerator.php b/src/User/Auth0/Auth0ManagementTokenGenerator.php
@@ -4,6 +4,7 @@
 
 namespace CultuurNet\UDB3\User\Auth0;
 
+use CultuurNet\UDB3\Json;
 use CultuurNet\UDB3\User\ManagementToken\ManagementToken;
 use CultuurNet\UDB3\User\ManagementToken\ManagementTokenGenerator;
 use DateTimeImmutable;
@@ -37,7 +38,7 @@ public function newToken(): ManagementToken
             ]
         );
 
-        $res = json_decode($response->getBody()->getContents(), true);
+        $res = Json::decodeAssociatively($response->getBody()->getContents());
 
         return new ManagementToken(
             $res['access_token'],

diff --git a/src/User/ManagementToken/CacheRepository.php b/src/User/ManagementToken/CacheRepository.php
@@ -25,7 +25,7 @@ public function token(): ?ManagementToken
             return null;
         }
 
-        $tokenAsArray = json_decode($this->cache->fetch(self::TOKEN_KEY), true);
+        $tokenAsArray = Json::decodeAssociatively($this->cache->fetch(self::TOKEN_KEY));
 
         return new ManagementToken(
             $tokenAsArray['token'],

diff --git a/tests/BackwardsCompatiblePayloadSerializerFactoryTest.php b/tests/BackwardsCompatiblePayloadSerializerFactoryTest.php
@@ -77,7 +77,7 @@ public function it_handles_main_language(
         Language $expectedMainLanguage
     ): void {
         $serialized = file_get_contents($sampleFile);
-        $decoded = json_decode($serialized, true);
+        $decoded = Json::decodeAssociatively($serialized);
 
         /** @var EventCreated|PlaceCreated|OrganizerCreatedWithUniqueWebsite $created */
         $created = $this->serializer->deserialize($decoded);
@@ -482,7 +482,7 @@ public function it_replaces_missing_availability_dates_with_null_on_booking_info
         $sampleFile = $this->sampleDir . 'serialized_event_booking_info_updated_without_availability.json';
 
         $serialized = file_get_contents($sampleFile);
-        $decoded = json_decode($serialized, true);
+        $decoded = Json::decodeAssociatively($serialized);
 
         /* @var BookingInfoUpdated $bookingInfoUpdated */
         $bookingInfoUpdated = $this->serializer->deserialize($decoded);
@@ -684,7 +684,7 @@ private function assertTypedIdReplacedWithItemId(string $type, string $sampleFil
     private function assertKeywordReplacedWithLabel(string $sampleFile): void
     {
         $serialized = file_get_contents($sampleFile);
-        $decoded = json_decode($serialized, true);
+        $decoded = Json::decodeAssociatively($serialized);
         $keyword = $decoded['payload']['keyword'];
 
         /** @var AbstractLabelEvent $abstractLabelEvent */

diff --git a/tests/Deserializer/JSONDeserializerTest.php b/tests/Deserializer/JSONDeserializerTest.php
@@ -26,7 +26,7 @@ public function setUp(): void
     public function itThrowsJsonExceptionForInvalidJson(): void
     {
         $this->expectException(JsonException::class);
-        $this->expectExceptionMessage('Invalid JSON');
+        $this->expectExceptionMessage('Syntax error');
 
         $this->deserializer->deserialize(
             '{

diff --git a/tests/Http/Assert/JsonEquals.php b/tests/Http/Assert/JsonEquals.php
@@ -4,6 +4,7 @@
 
 namespace CultuurNet\UDB3\Http\Assert;
 
+use CultuurNet\UDB3\Json;
 use PHPUnit\Framework\TestCase;
 
 class JsonEquals
@@ -21,8 +22,8 @@ public function __construct(TestCase $testCase)
 
     public function assert(string $expectedJson, string $actualJson): void
     {
-        $expected = json_decode($expectedJson, true);
-        $actual = json_decode($actualJson, true);
+        $expected = Json::decodeAssociatively($expectedJson);
+        $actual = Json::decodeAssociatively($actualJson);
 
         if (is_null($expected)) {
             $this->testCase->fail('Expected json is not valid json.');

diff --git a/tests/Http/Deserializer/Calendar/CalendarForEventDataValidatorTest.php b/tests/Http/Deserializer/Calendar/CalendarForEventDataValidatorTest.php
@@ -5,6 +5,7 @@
 namespace CultuurNet\UDB3\Http\Deserializer\Calendar;
 
 use CultuurNet\UDB3\Deserializer\DataValidationException;
+use CultuurNet\UDB3\Json;
 use PHPUnit\Framework\TestCase;
 
 class CalendarForEventDataValidatorTest extends TestCase
@@ -25,9 +26,8 @@ protected function setUp(): void
      */
     public function it_does_not_throw_for_valid_calendars(string $file): void
     {
-        $data = json_decode(
-            file_get_contents(__DIR__ . '/samples/' . $file),
-            true
+        $data = Json::decodeAssociatively(
+            file_get_contents(__DIR__ . '/samples/' . $file)
         );
 
         $this->calendarForEventDataValidator->validate($data);

diff --git a/tests/Http/Deserializer/Calendar/CalendarJSONParserTest.php b/tests/Http/Deserializer/Calendar/CalendarJSONParserTest.php
@@ -11,6 +11,7 @@
 use CultuurNet\UDB3\Event\ValueObjects\Status;
 use CultuurNet\UDB3\Event\ValueObjects\StatusReason;
 use CultuurNet\UDB3\Event\ValueObjects\StatusType;
+use CultuurNet\UDB3\Json;
 use CultuurNet\UDB3\Language;
 use CultuurNet\UDB3\Model\ValueObject\Calendar\OpeningHours\Hour;
 use CultuurNet\UDB3\Model\ValueObject\Calendar\OpeningHours\Minute;
@@ -34,7 +35,7 @@ class CalendarJSONParserTest extends TestCase
     protected function setUp(): void
     {
         $updateCalendar = file_get_contents(__DIR__ . '/samples/calendar_all_fields.json');
-        $this->updateCalendarAsArray = json_decode($updateCalendar, true);
+        $this->updateCalendarAsArray = Json::decodeAssociatively($updateCalendar);
 
         $this->calendarJSONParser = new CalendarJSONParser();
     }
@@ -60,7 +61,7 @@ public function it_can_get_the_start_date(): void
     public function it_returns_null_when_start_date_is_missing(): void
     {
         $updateCalendar = file_get_contents(__DIR__ . '/samples/calendar_missing_start_and_end.json');
-        $updateCalendarAsArray = json_decode($updateCalendar, true);
+        $updateCalendarAsArray = Json::decodeAssociatively($updateCalendar);
 
         $this->assertNull(
             $this->calendarJSONParser->getStartDate(
@@ -90,7 +91,7 @@ public function it_can_get_the_end_date(): void
     public function it_returns_null_when_end_date_is_missing(): void
     {
         $updateCalendar = file_get_contents(__DIR__ . '/samples/calendar_missing_start_and_end.json');
-        $updateCalendarAsArray = json_decode($updateCalendar, true);
+        $updateCalendarAsArray = Json::decodeAssociatively($updateCalendar);
 
         $this->assertNull(
             $this->calendarJSONParser->getEndDate(
@@ -180,9 +181,8 @@ public function it_can_get_the_timestamps(): void
      */
     public function it_should_not_create_timestamps_when_json_is_missing_an_end_property(): void
     {
-        $calendarData = json_decode(
-            file_get_contents(__DIR__ . '/samples/calendar_missing_time_span_end.json'),
-            true
+        $calendarData = Json::decodeAssociatively(
+            file_get_contents(__DIR__ . '/samples/calendar_missing_time_span_end.json')
         );
 
         $this->assertEmpty(
@@ -195,9 +195,8 @@ public function it_should_not_create_timestamps_when_json_is_missing_an_end_prop
      */
     public function it_should_not_create_timestamps_when_json_is_missing_a_start_property(): void
     {
-        $calendarData = json_decode(
-            file_get_contents(__DIR__ . '/samples/calendar_missing_time_span_start.json'),
-            true
+        $calendarData = Json::decodeAssociatively(
+            file_get_contents(__DIR__ . '/samples/calendar_missing_time_span_start.json')
         );
 
         $this->assertEmpty(
@@ -255,9 +254,8 @@ public function it_can_get_the_opening_hours(): void
      */
     public function it_should_not_create_opening_hours_when_fields_are_missing(): void
     {
-        $calendarData = json_decode(
-            file_get_contents(__DIR__ . '/samples/calendar_with_opening_hours_but_missing_fields.json'),
-            true
+        $calendarData = Json::decodeAssociatively(
+            file_get_contents(__DIR__ . '/samples/calendar_with_opening_hours_but_missing_fields.json')
         );
 
         $this->assertEmpty(

diff --git a/tests/Http/Ownership/RequestOwnershipRequestHandlerTest.php b/tests/Http/Ownership/RequestOwnershipRequestHandlerTest.php
@@ -9,6 +9,7 @@
 use CultuurNet\UDB3\Http\ApiProblem\AssertApiProblemTrait;
 use CultuurNet\UDB3\Http\ApiProblem\SchemaError;
 use CultuurNet\UDB3\Http\Request\Psr7RequestBuilder;
+use CultuurNet\UDB3\Json;
 use CultuurNet\UDB3\Model\ValueObject\Identity\ItemType;
 use CultuurNet\UDB3\Model\ValueObject\Identity\UserId;
 use CultuurNet\UDB3\Model\ValueObject\Identity\UUID;
@@ -98,7 +99,7 @@ public function it_handles_requesting_ownership(): void
             [
                 'id' => 'e6e1f3a0-3e5e-4b3e-8e3e-3f3e3e3e3e3e',
             ],
-            json_decode((string) $response->getBody(), true)
+            Json::decodeAssociatively((string) $response->getBody())
         );
 
         $this->assertEquals(
@@ -156,7 +157,7 @@ public function it_handles_requesting_ownership_as_admin(): void
             [
                 'id' => 'e6e1f3a0-3e5e-4b3e-8e3e-3f3e3e3e3e3e',
             ],
-            json_decode((string) $response->getBody(), true)
+            Json::decodeAssociatively((string) $response->getBody())
         );
 
         $this->assertEquals(

diff --git a/tests/Offer/IriOfferIdentifierJSONDeserializerTest.php b/tests/Offer/IriOfferIdentifierJSONDeserializerTest.php
@@ -58,7 +58,7 @@ public function it_throws_an_json_exception_when_the_json_is_malformed(): void
         $json = '{"foo"';
 
         $this->expectException(JsonException::class);
-        $this->expectExceptionMessage('Invalid JSON');
+        $this->expectExceptionMessage('Syntax error');
 
         $this->deserializer->deserialize($json);
     }