From 91d9c8c50ce64d10d9d91cf60cf90a4de66c6295 Mon Sep 17 00:00:00 2001
From: Sebastien Curt <sebastien.curt@tetras-libre.fr>
Date: Mon, 7 Feb 2022 15:10:57 +0100
Subject: [PATCH] Fix unit tests
---
src/Builder/UserBuilder.php | 3 ++-
src/Controller/RegistrationController.php | 3 +--
src/Entity/User.php | 1 +
src/Form/RegistrationFormType.php | 1 -
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/Builder/UserBuilder.php b/src/Builder/UserBuilder.php
index e314af4..e457f77 100644
--- a/src/Builder/UserBuilder.php
+++ b/src/Builder/UserBuilder.php
@@ -105,8 +105,9 @@ class UserBuilder
return $this;
}
- public function withNewsLetterSubscription(bool $newsLetterSubscription)
+ public function withNewsLetterSubscription(bool $newsLetterSubscription): UserBuilder
{
$this->user->setSubscribedToNewsLetter($newsLetterSubscription);
+ return $this;
}
}
diff --git a/src/Controller/RegistrationController.php b/src/Controller/RegistrationController.php
index 7c98102..ae8a724 100644
--- a/src/Controller/RegistrationController.php
+++ b/src/Controller/RegistrationController.php
@@ -54,12 +54,11 @@ class RegistrationController extends AbstractController
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
- $user = $form->getData();
$userBuilder = new UserBuilder($userPasswordHasher, $user);
// Ugly fix because I don't understand why those values aren't set correctly
$userBuilder->withAcceptGeneralConditions($form->get('acceptGeneralConditions')->getData());
- $userBuilder->withNewsLetterSubscription($form->get('subscribedToNewsLetter')->getData() ?? false);
+ $userBuilder->withNewsLetterSubscription(false);
$userBuilder
->withPassword(
diff --git a/src/Entity/User.php b/src/Entity/User.php
index e707f67..1157a35 100644
--- a/src/Entity/User.php
+++ b/src/Entity/User.php
@@ -105,6 +105,7 @@ class User implements UserInterface, LegacyPasswordAuthenticatedUserInterface
$this->acceptGeneralConditions = false;
$this->isVerified = false;
$this->credentialExpired = false;
+ $this->is_subscribed_news_letter = false;
}
public function getId(): int
diff --git a/src/Form/RegistrationFormType.php b/src/Form/RegistrationFormType.php
index 9129195..403bfa8 100644
--- a/src/Form/RegistrationFormType.php
+++ b/src/Form/RegistrationFormType.php
@@ -88,7 +88,6 @@ class RegistrationFormType extends AbstractType
'label' => 'registration.agreeTerms'
]
)
- ->add('subscribedToNewsLetter', HiddenType::class)
->add(
'submit',
SubmitType::class,
--
GitLab