From 059e4a0acd76453f3d6975b2f2543deaaa770e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 28 May 2024 12:31:46 +0200 Subject: [PATCH] fixes for feature "refactor store object form widget" --- .../Form/DataTransformer/StoredObjectDataTransformer.php | 4 ++-- .../Serializer/Normalizer/StoredObjectNormalizer.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Bundle/ChillDocStoreBundle/Form/DataTransformer/StoredObjectDataTransformer.php b/src/Bundle/ChillDocStoreBundle/Form/DataTransformer/StoredObjectDataTransformer.php index dfa1b6d4e..520b644b3 100644 --- a/src/Bundle/ChillDocStoreBundle/Form/DataTransformer/StoredObjectDataTransformer.php +++ b/src/Bundle/ChillDocStoreBundle/Form/DataTransformer/StoredObjectDataTransformer.php @@ -20,7 +20,7 @@ use Symfony\Component\Serializer\SerializerInterface; class StoredObjectDataTransformer implements DataTransformerInterface { public function __construct( - private SerializerInterface $serializer + private readonly SerializerInterface $serializer ) { } @@ -47,6 +47,6 @@ class StoredObjectDataTransformer implements DataTransformerInterface return null; } - return json_decode($value, true, 10, JSON_THROW_ON_ERROR); + return json_decode((string) $value, true, 10, JSON_THROW_ON_ERROR); } } diff --git a/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectNormalizer.php b/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectNormalizer.php index 1b00cc447..83bc85a9b 100644 --- a/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectNormalizer.php +++ b/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectNormalizer.php @@ -56,8 +56,8 @@ final class StoredObjectNormalizer implements NormalizerInterface, NormalizerAwa // deprecated property $datas['creationDate'] = $datas['createdAt']; - $canDavSee = in_array(self::ADD_DAV_SEE_LINK_CONTEXT, $context['groups'] ?? []); - $canDavEdit = in_array(self::ADD_DAV_EDIT_LINK_CONTEXT, $context['groups'] ?? []); + $canDavSee = in_array(self::ADD_DAV_SEE_LINK_CONTEXT, $context['groups'] ?? [], true); + $canDavEdit = in_array(self::ADD_DAV_EDIT_LINK_CONTEXT, $context['groups'] ?? [], true); if ($canDavSee || $canDavEdit) { $accessToken = $this->JWTDavTokenProvider->createToken(