Merge branch 'issue495_AccPeriodWorkEval_circular_reference' into 'master'

AccompanyingPeriodWorkEvaluation: fix circular reference when serialising

See merge request Chill-Projet/chill-bundles!383

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person] AccompanyingPeriodWorkEvaluation: fix circular reference when serialising (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/495)
 * [person] order accompanying period by opening date in search persons, person and household period lists (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/493)
 * [parcours] autosave of the pinned comment for draft accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/477)
 * [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)

src/Bundle/ChillMainBundle/Entity/UserJob.php

@@ -40,6 +40,7 @@ class UserJob
      * @var array|string[]A
      * @ORM\Column(name="label", type="json")
      * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     protected array $label = [];
 

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue

@@ -42,9 +42,6 @@
                   <a class="btn btn-sm btn-show" :href="getUrl(e)">
                      {{ $t('show_entity', { entity: $t('the_evaluation') }) }}
                   </a>
-                  <a class="btn btn-sm btn-update" :href="getUrl(e.accompanyingPeriodWork)">
-                     {{ $t('show_entity', { entity: $t('the_action') }) }}
-                  </a>
                   <a class="btn btn-sm btn-show" :href="getUrl(e.accompanyingPeriodWork.accompanyingPeriod)">
                      {{ $t('show_entity', { entity: $t('the_course') }) }}
                   </a>
@@ -102,4 +99,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php

@@ -16,10 +16,11 @@ use libphonenumber\PhoneNumber;
 use libphonenumber\PhoneNumberUtil;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-class PhonenumberNormalizer implements NormalizerInterface, DenormalizerInterface
+class PhonenumberNormalizer implements ContextAwareNormalizerInterface, DenormalizerInterface
 {
     private string $defaultCarrierCode;
 
@@ -53,6 +54,10 @@ class PhonenumberNormalizer implements NormalizerInterface, DenormalizerInterfac
 
     public function normalize($object, ?string $format = null, array $context = []): string
     {
+        if ($format === 'docgen' && null === $object) {
+            return '';
+        }
+
         return $this->phoneNumberUtil->formatOutOfCountryCallingNumber($object, $this->defaultCarrierCode);
     }
 
@@ -61,8 +66,18 @@ class PhonenumberNormalizer implements NormalizerInterface, DenormalizerInterfac
         return 'libphonenumber\PhoneNumber' === $type;
     }
 
-    public function supportsNormalization($data, ?string $format = null)
+    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
     {
-        return $data instanceof PhoneNumber;
+        if ($data instanceof PhoneNumber && $format === 'json') {
+            return true;
+        }
+
+        if ($format === 'docgen' && (
+            $data instanceof PhoneNumber || PhoneNumber::class === ($context['docgen:expects'] ?? null)
+            )) {
+            return true;
+        }
+
+        return false;
     }
 }

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php

@@ -124,6 +124,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
     private ?DateTimeImmutable $maxDate = null;

src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php

@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Serializer\Normalizer;
 use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
 use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
@@ -46,7 +47,10 @@ class AccompanyingPeriodWorkEvaluationNormalizer implements ContextAwareNormaliz
     {
         $initial = $this->normalizer->normalize($object, $format, array_merge(
             $context,
-            [self::IGNORE_EVALUATION => spl_object_hash($object)]
+            [self::IGNORE_EVALUATION => spl_object_hash($object)],
+            [AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER => static function ($object, $format, $context) {
+                return $object->getId();
+            }]
         ));
 
         // due to bug: https://api-platform.com/docs/core/serialization/#collection-relation