Merge remote-tracking branch 'origin/master' into workflow/fixes-2022-02

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

@@ -19,7 +19,7 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonAltName;
 use Chill\PersonBundle\Repository\Relationships\RelationshipRepository;
-use Chill\PersonBundle\Templating\Entity\PersonRender;
+use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
 use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
@@ -37,7 +37,7 @@ class PersonDocGenNormalizer implements
 {
     use NormalizerAwareTrait;
 
-    private PersonRender $personRender;
+    private PersonRenderInterface $personRender;
 
     private RelationshipRepository $relationshipRepository;
 
@@ -46,7 +46,7 @@ class PersonDocGenNormalizer implements
     private TranslatorInterface $translator;
 
     public function __construct(
-        PersonRender $personRender,
+        PersonRenderInterface $personRender,
         RelationshipRepository $relationshipRepository,
         TranslatorInterface $translator,
         TranslatableStringHelper $translatableStringHelper

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

@@ -23,21 +23,15 @@ use Doctrine\Common\Collections\Collection;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
-use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
 use function array_key_exists;
 
 /**
  * Serialize a Person entity.
  */
-class PersonJsonNormalizer implements
-    DenormalizerAwareInterface,
-    DenormalizerInterface,
-    NormalizerAwareInterface,
-    NormalizerInterface
+class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwareInterface, PersonJsonNormalizerInterface
 {
     use DenormalizerAwareTrait;
 

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

@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Serializer\Normalizer;
+
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+/**
+ * Serialize a Person entity.
+ */
+interface PersonJsonNormalizerInterface extends
+    DenormalizerInterface,
+    NormalizerInterface
+{
+}