fix error when creating user with username / email validation

This commit is contained in:
Julien Fastré 2018-07-18 16:06:00 +02:00
parent 4f9626e65f
commit 0a0a7e7c24

View File

@ -48,6 +48,7 @@ class UserUniqueEmailAndUsername extends ConstraintValidator
. "only on class ".User::class); . "only on class ".User::class);
} }
if ($value->getId() !== null) {
$countUsersByUsername = $this->em->createQuery( $countUsersByUsername = $this->em->createQuery(
sprintf( sprintf(
"SELECT COUNT(u) FROM %s u " "SELECT COUNT(u) FROM %s u "
@ -58,6 +59,16 @@ class UserUniqueEmailAndUsername extends ConstraintValidator
->setParameter('username', $value->getUsername()) ->setParameter('username', $value->getUsername())
->setParameter('user', $value) ->setParameter('user', $value)
->getSingleScalarResult(); ->getSingleScalarResult();
} else {
$countUsersByUsername = $this->em->createQuery(
sprintf(
"SELECT COUNT(u) FROM %s u "
. "WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) ",
User::class)
)
->setParameter('username', $value->getUsername())
->getSingleScalarResult();
}
if ($countUsersByUsername > 0) { if ($countUsersByUsername > 0) {
$this->context $this->context
@ -70,6 +81,7 @@ class UserUniqueEmailAndUsername extends ConstraintValidator
; ;
} }
if ($value->getId() !== null) {
$countUsersByEmail = $this->em->createQuery( $countUsersByEmail = $this->em->createQuery(
sprintf( sprintf(
"SELECT COUNT(u) FROM %s u " "SELECT COUNT(u) FROM %s u "
@ -80,6 +92,16 @@ class UserUniqueEmailAndUsername extends ConstraintValidator
->setParameter('email', $value->getEmail()) ->setParameter('email', $value->getEmail())
->setParameter('user', $value) ->setParameter('user', $value)
->getSingleScalarResult(); ->getSingleScalarResult();
} else {
$countUsersByEmail = $this->em->createQuery(
sprintf(
"SELECT COUNT(u) FROM %s u "
. "WHERE u.emailCanonical = LOWER(UNACCENT(:email))",
User::class)
)
->setParameter('email', $value->getEmail())
->getSingleScalarResult();
}
if ($countUsersByEmail > 0) { if ($countUsersByEmail > 0) {
$this->context $this->context