diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php index e3e7b68a9..b8fca5119 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php +++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php @@ -11,11 +11,11 @@ declare(strict_types=1); namespace Chill\DocGeneratorBundle\Serializer\Encoder; -use Symfony\Component\Serializer\Exception\UnexpectedValueException; +use Symfony\Component\Serializer\Encoder\EncoderInterface; +use Symfony\Component\Serializer\Exception\UnexpectedValueException; use function array_keys; use function is_array; -use Symfony\Component\Serializer\Encoder\EncoderInterface; class DocGenEncoder implements EncoderInterface { diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php index 49bef0270..55774dd83 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php +++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php @@ -26,6 +26,7 @@ class CollectionDocGenNormalizer implements ContextAwareNormalizerInterface, Nor /** * @param Collection $object + * @param null|string $format * * @return array|ArrayObject|bool|float|int|string|void|null */ diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php index c33f3ce89..f66eb4de6 100644 --- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php +++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php @@ -48,6 +48,7 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw /** * @param Address $address + * @param null|string $format */ public function normalize($address, $format = null, array $context = []) { diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php index b9139cf54..7ca4d563c 100644 --- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php +++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php @@ -22,6 +22,7 @@ class CollectionNormalizer implements NormalizerAwareInterface, NormalizerInterf /** * @param Collection $collection + * @param null|string $format */ public function normalize($collection, $format = null, array $context = []) { diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php index f73db6a28..65e83cdbc 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php @@ -85,7 +85,7 @@ class AccompanyingCourseCommentController extends AbstractController return $this->render('@ChillPerson/AccompanyingCourse/comment_list.html.twig', [ 'accompanyingCourse' => $accompanyingCourse, 'form' => $form->createView(), - 'edit_form' => $editForm !== null ? $editForm->createView() : null, + 'edit_form' => null !== $editForm ? $editForm->createView() : null, 'commentEditId' => $commentEditId ?? null, ]); } diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php index 521c24c29..4343561fc 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php @@ -93,6 +93,7 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf /** * @param AccompanyingPeriod|null $period + * @param null|string $format */ public function normalize($period, $format = null, array $context = []) { diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php index 7ee2a53c8..88dce414f 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php @@ -19,9 +19,9 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface; */ final class AccompanyingPeriodOriginNormalizer implements NormalizerInterface { - /** * @param Origin $origin + * @param null|string $format */ public function normalize($origin, $format = null, array $context = []) { diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php index dda79dbdf..b392ccc24 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php @@ -21,6 +21,7 @@ class AccompanyingPeriodParticipationNormalizer implements NormalizerAwareInterf /** * @param AccompanyingPeriodParticipation $participation + * @param null|string $format */ public function normalize($participation, $format = null, array $context = []) { diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php index 13dfc32e3..273c2aa32 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php @@ -14,7 +14,6 @@ namespace Chill\PersonBundle\Serializer\Normalizer; use Chill\MainBundle\Entity\Center; use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface; use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension; -use Chill\PersonBundle\Entity\Household\Household; use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Repository\PersonRepository; use DateTime; @@ -142,6 +141,7 @@ class PersonJsonNormalizer implements /** * @param Person $person + * @param null|string $format */ public function normalize($person, $format = null, array $context = []) { diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php index 92eacfac3..cfae9f6e6 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php @@ -31,6 +31,7 @@ class RelationshipDocGenNormalizer implements ContextAwareNormalizerInterface, N /** * @param Relationship $relation + * @param null|string $format */ public function normalize($relation, $format = null, array $context = []) { diff --git a/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php b/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php index 98b8a34ca..d2dd7fc18 100644 --- a/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php +++ b/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php @@ -73,9 +73,9 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository $orXDate ->add( $qb->expr()->orX( - $qb->expr()->isNull('t.endDate'), - $qb->expr()->gte('t.endDate - COALESCE(t.warningInterval, :intervalBlank)', ':now') - ) + $qb->expr()->isNull('t.endDate'), + $qb->expr()->gte('t.endDate - COALESCE(t.warningInterval, :intervalBlank)', ':now') + ) ); $qb ->setParameter('intervalBlank', new DateInterval('P0D')) @@ -87,11 +87,11 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository $orXDate ->add( $qb->expr()->andX( - $qb->expr()->not($qb->expr()->isNull('t.endDate')), - $qb->expr()->not($qb->expr()->isNull('t.warningInterval')), - $qb->expr()->lte('t.endDate - t.warningInterval', ':now'), - $qb->expr()->gt('t.endDate', ':now') - ) + $qb->expr()->not($qb->expr()->isNull('t.endDate')), + $qb->expr()->not($qb->expr()->isNull('t.warningInterval')), + $qb->expr()->lte('t.endDate - t.warningInterval', ':now'), + $qb->expr()->gt('t.endDate', ':now') + ) ); $qb ->setParameter('now', $now); @@ -102,9 +102,9 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository $orXDate ->add( $qb->expr()->andX( - $qb->expr()->not($qb->expr()->isNull('t.endDate')), - $qb->expr()->lte('t.endDate', ':now') - ) + $qb->expr()->not($qb->expr()->isNull('t.endDate')), + $qb->expr()->lte('t.endDate', ':now') + ) ); $qb ->setParameter('now', $now); diff --git a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php index 2c47df6c7..d95192f2a 100644 --- a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php +++ b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php @@ -30,6 +30,7 @@ class ThirdPartyNormalizer implements NormalizerAwareInterface, NormalizerInterf /** * @param ThirdParty $thirdParty + * @param null|string $format */ public function normalize($thirdParty, $format = null, array $context = []) {