Replace json_encode with Json::encode

cultuurnet · Aug 8, 2024 · f031b82 · f031b82
1 parent ce61f48
commit f031b82
Show file tree

Hide file tree

Showing 44 changed files with 159 additions and 119 deletions.
diff --git a/features/Steps/OwnershipSteps.php b/features/Steps/OwnershipSteps.php
@@ -4,6 +4,8 @@
 
 namespace CultuurNet\UDB3\Steps;
 
+use CultuurNet\UDB3\Json;
+
 trait OwnershipSteps
 {
     /**
@@ -17,7 +19,7 @@ public function iRequestOwnershipForOnTheOrganizerWithOrganizerIdAndSaveTheAs(
     ): void {
         $this->requestOwnership(
             '/ownerships',
-            $this->variableState->replaceVariables(json_encode([
+            $this->variableState->replaceVariables(Json::encode([
                 'itemId' => $organizerId,
                 'itemType' => 'organizer',
                 'ownerId' => $ownerId,

diff --git a/src/Broadway/AMQP/Message/Body/EntireDomainMessageBodyFactory.php b/src/Broadway/AMQP/Message/Body/EntireDomainMessageBodyFactory.php
@@ -7,6 +7,7 @@
 use Broadway\Domain\DomainMessage;
 use Broadway\Serializer\Serializable;
 use Broadway\Serializer\SerializationException;
+use CultuurNet\UDB3\Json;
 
 class EntireDomainMessageBodyFactory implements BodyFactoryInterface
 {
@@ -23,7 +24,7 @@ public function createBody(DomainMessage $domainMessage): string
             'recorded_on' => $domainMessage->getRecordedOn()->toString(),
         ];
 
-        return json_encode($data);
+        return Json::encode($data);
     }
 
     /**

diff --git a/src/Broadway/AMQP/Message/Body/PayloadOnlyBodyFactory.php b/src/Broadway/AMQP/Message/Body/PayloadOnlyBodyFactory.php
@@ -7,14 +7,15 @@
 use Broadway\Domain\DomainMessage;
 use Broadway\Serializer\Serializable;
 use Broadway\Serializer\SerializationException;
+use CultuurNet\UDB3\Json;
 
 class PayloadOnlyBodyFactory implements BodyFactoryInterface
 {
     public function createBody(DomainMessage $domainMessage): string
     {
         $this->guardSerializable($domainMessage->getPayload());
 
-        return json_encode(
+        return Json::encode(
             $domainMessage->getPayload()->serialize()
         );
     }

diff --git a/src/Http/Deserializer/Event/MajorInfoJSONDeserializer.php b/src/Http/Deserializer/Event/MajorInfoJSONDeserializer.php
@@ -11,6 +11,7 @@
 use CultuurNet\UDB3\Http\Deserializer\Calendar\CalendarJSONDeserializer;
 use CultuurNet\UDB3\Http\Deserializer\Calendar\CalendarJSONParser;
 use CultuurNet\UDB3\Http\Deserializer\Theme\ThemeJSONDeserializer;
+use CultuurNet\UDB3\Json;
 use CultuurNet\UDB3\Model\ValueObject\Text\Title;
 
 /**
@@ -49,9 +50,9 @@ public function deserialize(string $data): MajorInfo
         $data = parent::deserialize($data);
         $this->validator->validate($data);
 
-        $type = $this->typeDeserializer->deserialize(json_encode($data['type']));
+        $type = $this->typeDeserializer->deserialize(Json::encode($data['type']));
 
-        $calendar = $this->calendarDeserializer->deserialize(json_encode($data['calendar']));
+        $calendar = $this->calendarDeserializer->deserialize(Json::encode($data['calendar']));
 
         $locationId = $data['location'];
         if (is_array($locationId) && isset($locationId['id'])) {
@@ -61,7 +62,7 @@ public function deserialize(string $data): MajorInfo
 
         $theme = null;
         if (!empty($data['theme'])) {
-            $theme = $this->themeDeserializer->deserialize(json_encode($data['theme']));
+            $theme = $this->themeDeserializer->deserialize(Json::encode($data['theme']));
         }
 
         return new MajorInfo(

diff --git a/src/Http/Deserializer/Place/MajorInfoJSONDeserializer.php b/src/Http/Deserializer/Place/MajorInfoJSONDeserializer.php
@@ -11,6 +11,7 @@
 use CultuurNet\UDB3\Http\Deserializer\Calendar\CalendarJSONDeserializer;
 use CultuurNet\UDB3\Http\Deserializer\Calendar\CalendarJSONParser;
 use CultuurNet\UDB3\Http\Deserializer\Event\EventTypeJSONDeserializer;
+use CultuurNet\UDB3\Json;
 use CultuurNet\UDB3\Model\ValueObject\Text\Title;
 
 /**
@@ -49,11 +50,11 @@ public function deserialize(string $data): MajorInfo
         $data = parent::deserialize($data);
         $this->validator->validate($data);
 
-        $type = $this->typeDeserializer->deserialize(json_encode($data['type']));
+        $type = $this->typeDeserializer->deserialize(Json::encode($data['type']));
 
-        $address = $this->addressDeserializer->deserialize(json_encode($data['address']));
+        $address = $this->addressDeserializer->deserialize(Json::encode($data['address']));
 
-        $calendar = $this->calendarDeserializer->deserialize(json_encode($data['calendar']));
+        $calendar = $this->calendarDeserializer->deserialize(Json::encode($data['calendar']));
 
         return new MajorInfo(
             new Title($data['name']),

diff --git a/src/Http/Response/JsonResponse.php b/src/Http/Response/JsonResponse.php
@@ -5,6 +5,7 @@
 namespace CultuurNet\UDB3\Http\Response;
 
 use CultuurNet\UDB3\Http\ApiProblem\ApiProblem;
+use CultuurNet\UDB3\Json;
 use Fig\Http\Message\StatusCodeInterface;
 use JsonException;
 use Slim\Psr7\Factory\StreamFactory;
@@ -22,7 +23,7 @@ public function __construct($data, int $status = StatusCodeInterface::STATUS_OK,
     {
         try {
             if (!is_string($data)) {
-                $data = json_encode($data, JSON_THROW_ON_ERROR);
+                $data = Json::encode($data);
             }
 
             $body = (new StreamFactory())->createStream($data);

diff --git a/src/Offer/Commands/AddLabelToMultipleJSONDeserializer.php b/src/Offer/Commands/AddLabelToMultipleJSONDeserializer.php
@@ -8,6 +8,7 @@
 use CultuurNet\UDB3\Deserializer\JSONDeserializer;
 use CultuurNet\UDB3\Deserializer\MissingValueException;
 use CultuurNet\UDB3\Deserializer\NotWellFormedException;
+use CultuurNet\UDB3\Json;
 use CultuurNet\UDB3\Model\ValueObject\Taxonomy\Label\Label;
 use CultuurNet\UDB3\Model\ValueObject\Taxonomy\Label\LabelName;
 use CultuurNet\UDB3\Offer\OfferIdentifierCollection;
@@ -45,7 +46,7 @@ public function deserialize(string $data): AddLabelToMultiple
 
         foreach ($data->offers as $offer) {
             $offers = $offers->with(
-                $this->offerIdentifierDeserializer->deserialize(json_encode($offer))
+                $this->offerIdentifierDeserializer->deserialize(Json::encode($offer))
             );
         }
 

diff --git a/src/Role/ReadModel/Labels/LabelRolesProjector.php b/src/Role/ReadModel/Labels/LabelRolesProjector.php
@@ -4,6 +4,7 @@
 
 namespace CultuurNet\UDB3\Role\ReadModel\Labels;
 
+use CultuurNet\UDB3\Json;
 use CultuurNet\UDB3\Label\Events\Created as LabelCreated;
 use CultuurNet\UDB3\Label\ReadModels\JSON\Repository\Entity;
 use CultuurNet\UDB3\Model\ValueObject\Identity\UUID;
@@ -71,7 +72,7 @@ private function createNewDocument(UUID $uuid)
     {
         $document = new JsonDocument(
             $uuid->toString(),
-            json_encode([])
+            Json::encode([])
         );
         return $document;
     }

diff --git a/src/Role/ReadModel/Labels/RoleLabelsProjector.php b/src/Role/ReadModel/Labels/RoleLabelsProjector.php
@@ -4,6 +4,7 @@
 
 namespace CultuurNet\UDB3\Role\ReadModel\Labels;
 
+use CultuurNet\UDB3\Json;
 use CultuurNet\UDB3\Label\Events\LabelDetailsProjectedToJSONLD;
 use CultuurNet\UDB3\Label\ReadModels\JSON\Repository\Entity;
 use CultuurNet\UDB3\Label\ReadModels\JSON\Repository\ReadRepositoryInterface;
@@ -136,7 +137,7 @@ private function createNewDocument(UUID $uuid)
     {
         $document = new JsonDocument(
             $uuid->toString(),
-            json_encode([])
+            Json::encode([])
         );
         return $document;
     }

diff --git a/src/Role/ReadModel/Users/RoleUsersProjector.php b/src/Role/ReadModel/Users/RoleUsersProjector.php
@@ -4,6 +4,7 @@
 
 namespace CultuurNet\UDB3\Role\ReadModel\Users;
 
+use CultuurNet\UDB3\Json;
 use CultuurNet\UDB3\Model\ValueObject\Identity\UUID;
 use CultuurNet\UDB3\ReadModel\DocumentDoesNotExist;
 use CultuurNet\UDB3\ReadModel\DocumentRepository;
@@ -69,7 +70,7 @@ public function applyRoleCreated(RoleCreated $roleCreated): void
         $this->repository->save(
             new JsonDocument(
                 $roleCreated->getUuid()->toString(),
-                json_encode([])
+                Json::encode([])
             )
         );
     }

diff --git a/src/Role/ReadModel/Users/UserRolesProjector.php b/src/Role/ReadModel/Users/UserRolesProjector.php
@@ -5,6 +5,7 @@
 namespace CultuurNet\UDB3\Role\ReadModel\Users;
 
 use CultuurNet\UDB3\EventHandling\DelegateEventHandlingToSpecificMethodTrait;
+use CultuurNet\UDB3\Json;
 use CultuurNet\UDB3\ReadModel\DocumentDoesNotExist;
 use CultuurNet\UDB3\ReadModel\DocumentRepository;
 use CultuurNet\UDB3\ReadModel\JsonDocument;
@@ -49,7 +50,7 @@ public function applyUserAdded(UserAdded $userAdded): void
         } catch (DocumentDoesNotExist $e) {
             $document = new JsonDocument(
                 $userId,
-                json_encode([])
+                Json::encode([])
             );
         }
 

diff --git a/src/User/ManagementToken/CacheRepository.php b/src/User/ManagementToken/CacheRepository.php
@@ -4,6 +4,7 @@
 
 namespace CultuurNet\UDB3\User\ManagementToken;
 
+use CultuurNet\UDB3\Json;
 use DateTimeImmutable;
 use Doctrine\Common\Cache\Cache;
 
@@ -35,13 +36,12 @@ public function token(): ?ManagementToken
 
     public function store(ManagementToken $token): void
     {
-        $tokenAsJson = json_encode(
+        $tokenAsJson = Json::encode(
             [
                 'token' => $token->getToken(),
                 'issuedAt' => $token->getIssuedAt()->format(DATE_ATOM),
                 'expiresIn' => $token->getExpiresIn(),
-            ],
-            JSON_THROW_ON_ERROR
+            ]
         );
 
         $this->cache->save(self::TOKEN_KEY, $tokenAsJson);

diff --git a/tests/Contributor/ContributorEnrichedRepositoryTest.php b/tests/Contributor/ContributorEnrichedRepositoryTest.php
@@ -4,6 +4,7 @@
 
 namespace CultuurNet\UDB3\Contributor;
 
+use CultuurNet\UDB3\Json;
 use CultuurNet\UDB3\Model\ValueObject\Identity\UUID;
 use CultuurNet\UDB3\Model\ValueObject\Web\EmailAddress;
 use CultuurNet\UDB3\Model\ValueObject\Web\EmailAddresses;
@@ -80,15 +81,15 @@ public function it_add_contributors_if_user_has_permission(string $itemType): vo
             );
 
 
-        $jsonLd = new JsonDocument($this->offerId, json_encode(['@type' => $itemType]));
+        $jsonLd = new JsonDocument($this->offerId, Json::encode(['@type' => $itemType]));
         $this->documentRepository->save($jsonLd);
 
         $fetchJsonLd = $this->contributorEnrichedRepository->fetch($this->offerId, false);
 
         $this->assertEquals(
             new JsonDocument(
                 $this->offerId,
-                json_encode([
+                Json::encode([
                     '@type' => $itemType,
                     'contributors' => [
                         '[email protected]',
@@ -123,15 +124,15 @@ public function it_does_not_add_contributors_if_there_are_none(string $itemType)
             );
 
 
-        $jsonLd = new JsonDocument($this->offerId, json_encode(['@type' => $itemType]));
+        $jsonLd = new JsonDocument($this->offerId, Json::encode(['@type' => $itemType]));
         $this->documentRepository->save($jsonLd);
 
         $fetchJsonLd = $this->contributorEnrichedRepository->fetch($this->offerId, false);
 
         $this->assertEquals(
             new JsonDocument(
                 $this->offerId,
-                json_encode([
+                Json::encode([
                     '@type' => $itemType,
                 ])
             ),
@@ -159,15 +160,15 @@ public function it_hides_contributors_if_user_has_no_permission(string $itemType
             ->with(new UUID($this->offerId));
 
 
-        $jsonLd = new JsonDocument($this->offerId, json_encode(['@type' => $itemType]));
+        $jsonLd = new JsonDocument($this->offerId, Json::encode(['@type' => $itemType]));
         $this->documentRepository->save($jsonLd);
 
         $fetchJsonLd = $this->contributorEnrichedRepository->fetch($this->offerId);
 
         $this->assertEquals(
             new JsonDocument(
                 $this->offerId,
-                json_encode([
+                Json::encode([
                     '@type' => $itemType,
                 ])
             ),
@@ -184,7 +185,7 @@ public function it_does_not_save_contributors(string $itemType): void
         $this->contributorEnrichedRepository->save(
             new JsonDocument(
                 $this->offerId,
-                json_encode([
+                Json::encode([
                     '@type' => $itemType,
                     'contributors' => [
                         '[email protected]',
@@ -197,7 +198,7 @@ public function it_does_not_save_contributors(string $itemType): void
         $this->assertEquals(
             new JsonDocument(
                 $this->offerId,
-                json_encode(['@type' => $itemType])
+                Json::encode(['@type' => $itemType])
             ),
             $this->contributorEnrichedRepository->fetch($this->offerId)
         );

diff --git a/tests/Event/GeoCoordinatesCommandHandlerTest.php b/tests/Event/GeoCoordinatesCommandHandlerTest.php
@@ -25,6 +25,7 @@
 use CultuurNet\UDB3\Geocoding\Coordinate\Latitude;
 use CultuurNet\UDB3\Geocoding\Coordinate\Longitude;
 use CultuurNet\UDB3\Geocoding\GeocodingService;
+use CultuurNet\UDB3\Json;
 use CultuurNet\UDB3\Language;
 use CultuurNet\UDB3\Model\ValueObject\Geography\CountryCode;
 use CultuurNet\UDB3\ReadModel\DocumentRepository;
@@ -60,13 +61,12 @@ protected function createCommandHandler(EventStore $eventStore, EventBus $eventB
         $documentRepository->expects($this->once())
             ->method('fetch')
             ->with(self::EVENT_ID)
-            ->willReturn(new JsonDocument(self::EVENT_ID, json_encode([
+            ->willReturn(new JsonDocument(self::EVENT_ID, Json::encode([
                 'name' => [
                     'nl' => 'Faith no More',
                     'fr' => 'Faith no More - a la francais',
-
                 ],
-            ], JSON_THROW_ON_ERROR)));
+            ])));
 
         return new GeoCoordinatesCommandHandler(
             $eventRepository,

diff --git a/tests/Event/Productions/ProductionEnrichedEventRepositoryTest.php b/tests/Event/Productions/ProductionEnrichedEventRepositoryTest.php
@@ -6,6 +6,7 @@
 
 use CultuurNet\UDB3\EntityNotFoundException;
 use CultuurNet\UDB3\Iri\IriGeneratorInterface;
+use CultuurNet\UDB3\Json;
 use CultuurNet\UDB3\ReadModel\DocumentRepository;
 use CultuurNet\UDB3\ReadModel\InMemoryDocumentRepository;
 use CultuurNet\UDB3\ReadModel\JsonDocument;
@@ -53,7 +54,7 @@ public function it_returns_a_null_production_when_the_event_does_not_belong_to_a
         $eventId = Uuid::uuid4()->toString();
         $originalJsonDocument = new JsonDocument(
             $eventId,
-            json_encode((object) ['@id' => $eventId])
+            Json::encode((object) ['@id' => $eventId])
         );
 
 
@@ -78,7 +79,7 @@ public function it_returns_production_data_when_event_belongs_to_a_production():
         $eventId = Uuid::uuid4()->toString();
         $originalJsonDocument = new JsonDocument(
             $eventId,
-            json_encode((object) ['@id' => $eventId])
+            Json::encode((object) ['@id' => $eventId])
         );
 
         $otherEventId = Uuid::uuid4()->toString();
@@ -122,7 +123,7 @@ public function it_does_not_save_a_production_in_json_document(): void
         $newProductionEnrichedEventRepository->save(
             new JsonDocument(
                 $eventId,
-                json_encode([
+                Json::encode([
                     '@type' => 'Event',
                     'production' => [
                         'id' => Uuid::uuid4()->toString(),
@@ -140,7 +141,7 @@ public function it_does_not_save_a_production_in_json_document(): void
         $this->assertEquals(
             new JsonDocument(
                 $eventId,
-                json_encode(['@type' => 'Event'])
+                Json::encode(['@type' => 'Event'])
             ),
             $inMemoryDocumentRepository->fetch($eventId)
         );