diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php index 4698373f1..1d735b2d9 100644 --- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php +++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php @@ -135,15 +135,13 @@ final class PersonController extends AbstractController $this->lastPostDataReset(); $address = $form->get('address')->getData(); - $addressForm = (bool) $form->get('addressForm')->getData(); - if (null !== $address && $addressForm) { + if (null !== $address) { $household = new Household(); $member = new HouseholdMember(); $member->setPerson($person); $member->setStartDate(new \DateTimeImmutable()); - $household->addMember($member); $household->setForceAddress($address); diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php index c7679db83..b182e3757 100644 --- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php +++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php @@ -11,7 +11,6 @@ declare(strict_types=1); namespace Chill\PersonBundle\Form; -use Chill\MainBundle\Entity\Address; use Chill\MainBundle\Form\Event\CustomizeFormEvent; use Chill\MainBundle\Form\Type\ChillDateType; use Chill\MainBundle\Form\Type\ChillPhoneNumberType; @@ -30,8 +29,6 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\EmailType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\Validator\Constraints\Callback; -use Symfony\Component\Validator\Context\ExecutionContextInterface; final class CreationPersonType extends AbstractType { @@ -106,9 +103,6 @@ final class CreationPersonType extends AbstractType { $resolver->setDefaults([ 'data_class' => Person::class, - 'constraints' => [ - new Callback($this->validateCheckedAddress(...)), - ], ]); } @@ -119,18 +113,4 @@ final class CreationPersonType extends AbstractType { return self::NAME; } - - public function validateCheckedAddress($data, ExecutionContextInterface $context, $payload): void - { - /** @var bool $addressFrom */ - $addressFrom = $context->getObject()->get('addressForm')->getData(); - /** @var ?Address $address */ - $address = $context->getObject()->get('address')->getData(); - - if ($addressFrom && null === $address) { - $context->buildViolation('person_creation.If you want to create an household, an address is required') - ->atPath('addressForm') - ->addViolation(); - } - } }