mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-08-22 15:43:51 +00:00
cs: Fix code style (safe rules only).
This commit is contained in:
@@ -1,43 +1,34 @@
|
||||
<?php
|
||||
/*
|
||||
* Copyright (C) 2018 Champs-Libres <info@champs-libres.coop>
|
||||
|
||||
/**
|
||||
* Chill is a software for social workers
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
* For the full copyright and license information, please view
|
||||
* the LICENSE file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Chill\MainBundle\Validation\Constraint;
|
||||
|
||||
use Symfony\Component\Validator\Constraint;
|
||||
|
||||
/**
|
||||
*
|
||||
* @Annotation
|
||||
*/
|
||||
class PhonenumberConstraint extends Constraint
|
||||
{
|
||||
public $notMobileMessage = "This is not a mobile phonenumber";
|
||||
|
||||
public $notLandlineMessage = "This is not a landline phonenumber";
|
||||
|
||||
public $notValidMessage = "This is not a valid phonenumber";
|
||||
|
||||
public $notLandlineMessage = 'This is not a landline phonenumber';
|
||||
|
||||
public $notMobileMessage = 'This is not a mobile phonenumber';
|
||||
|
||||
public $notValidMessage = 'This is not a valid phonenumber';
|
||||
|
||||
/**
|
||||
* The type of phone: landline (not able to receive sms) or mobile (can receive sms)
|
||||
* The type of phone: landline (not able to receive sms) or mobile (can receive sms).
|
||||
*
|
||||
* @var string 'landline', 'mobile' or 'any'
|
||||
*/
|
||||
public $type = null;
|
||||
|
||||
public $type;
|
||||
|
||||
public function validatedBy()
|
||||
{
|
||||
return \Chill\MainBundle\Validation\Validator\ValidPhonenumber::class;
|
||||
|
@@ -1,20 +1,10 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
|
||||
/**
|
||||
* Chill is a software for social workers
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
* For the full copyright and license information, please view
|
||||
* the LICENSE file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Chill\MainBundle\Validation\Constraint;
|
||||
@@ -22,25 +12,22 @@ namespace Chill\MainBundle\Validation\Constraint;
|
||||
use Symfony\Component\Validator\Constraint;
|
||||
|
||||
/**
|
||||
* Check that a role scope has a scope if required
|
||||
*
|
||||
* @author Julien Fastré <julien.fastre@champs-libres.coop>
|
||||
* Check that a role scope has a scope if required.
|
||||
*/
|
||||
class RoleScopeScopePresenceConstraint extends Constraint
|
||||
{
|
||||
|
||||
public $messagePresenceRequired = "The role \"%role%\" require to be associated with "
|
||||
. "a scope.";
|
||||
public $messageNullRequired = "The role \"%role%\" should not be associated with a scope.";
|
||||
|
||||
public function validatedBy()
|
||||
{
|
||||
return 'role_scope_scope_presence';
|
||||
}
|
||||
|
||||
public $messageNullRequired = 'The role "%role%" should not be associated with a scope.';
|
||||
|
||||
public $messagePresenceRequired = 'The role "%role%" require to be associated with '
|
||||
. 'a scope.';
|
||||
|
||||
public function getTargets()
|
||||
{
|
||||
return self::CLASS_CONSTRAINT;
|
||||
}
|
||||
|
||||
|
||||
public function validatedBy()
|
||||
{
|
||||
return 'role_scope_scope_presence';
|
||||
}
|
||||
}
|
||||
|
@@ -1,42 +1,30 @@
|
||||
<?php
|
||||
/*
|
||||
* Copyright (C) 2018 Julien Fastré <julien.fastre@champs-libres.coop>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
namespace Chill\MainBundle\Validation\Constraint;
|
||||
|
||||
use Symfony\Component\Validator\Constraint;
|
||||
use Chill\MainBundle\Validation\Validator\UserUniqueEmailAndUsername;
|
||||
|
||||
/**
|
||||
*
|
||||
* Chill is a software for social workers
|
||||
*
|
||||
* @author Julien Fastré <julien.fastre@champs-libres.coop>
|
||||
* For the full copyright and license information, please view
|
||||
* the LICENSE file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Chill\MainBundle\Validation\Constraint;
|
||||
|
||||
use Chill\MainBundle\Validation\Validator\UserUniqueEmailAndUsername;
|
||||
use Symfony\Component\Validator\Constraint;
|
||||
|
||||
class UserUniqueEmailAndUsernameConstraint extends Constraint
|
||||
{
|
||||
public $messageDuplicateUsername = "A user with the same or a close username already exists";
|
||||
public $messageDuplicateEmail = "A user with the same or a close email already exists";
|
||||
|
||||
public $messageDuplicateEmail = 'A user with the same or a close email already exists';
|
||||
|
||||
public $messageDuplicateUsername = 'A user with the same or a close username already exists';
|
||||
|
||||
public function getTargets()
|
||||
{
|
||||
return [self::CLASS_CONSTRAINT];
|
||||
}
|
||||
|
||||
public function validatedBy()
|
||||
{
|
||||
return UserUniqueEmailAndUsername::class;
|
||||
}
|
||||
|
||||
public function getTargets()
|
||||
{
|
||||
return [ self::CLASS_CONSTRAINT ];
|
||||
}
|
||||
}
|
||||
|
@@ -1,59 +1,45 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
|
||||
/**
|
||||
* Chill is a software for social workers
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
* For the full copyright and license information, please view
|
||||
* the LICENSE file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Chill\MainBundle\Validation\Validator;
|
||||
|
||||
use Chill\MainBundle\Security\RoleProvider;
|
||||
use Chill\MainBundle\Entity\RoleScope;
|
||||
use Symfony\Component\Validator\Constraint;
|
||||
use Symfony\Component\Validator\ConstraintValidator;
|
||||
use Chill\MainBundle\Security\RoleProvider;
|
||||
use Chill\MainBundle\Validation\Constraint\RoleScopeScopePresenceConstraint;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use RuntimeException;
|
||||
use Symfony\Component\Translation\TranslatorInterface;
|
||||
use Symfony\Component\Validator\Constraint;
|
||||
use Symfony\Component\Validator\ConstraintValidator;
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @author Julien Fastré <julien.fastre@champs-libres.coop>
|
||||
*/
|
||||
class RoleScopeScopePresence extends ConstraintValidator
|
||||
{
|
||||
/**
|
||||
*
|
||||
* @var RoleProvider
|
||||
*/
|
||||
private $roleProvider;
|
||||
|
||||
/**
|
||||
*
|
||||
* @var LoggerInterface
|
||||
*/
|
||||
private $logger;
|
||||
|
||||
|
||||
/**
|
||||
* @var RoleProvider
|
||||
*/
|
||||
private $roleProvider;
|
||||
|
||||
/**
|
||||
*
|
||||
* @var TranslatorInterface
|
||||
*/
|
||||
private $translator;
|
||||
|
||||
public function __construct(RoleProvider $roleProvider, LoggerInterface $logger,
|
||||
TranslatorInterface $translator)
|
||||
|
||||
public function __construct(
|
||||
RoleProvider $roleProvider,
|
||||
LoggerInterface $logger,
|
||||
TranslatorInterface $translator
|
||||
)
|
||||
{
|
||||
$this->roleProvider = $roleProvider;
|
||||
$this->logger = $logger;
|
||||
@@ -62,41 +48,37 @@ class RoleScopeScopePresence extends ConstraintValidator
|
||||
|
||||
public function validate($value, Constraint $constraint)
|
||||
{
|
||||
if (! $value instanceof RoleScope) {
|
||||
throw new \RuntimeException('The validated object is not an instance of roleScope');
|
||||
if (!$value instanceof RoleScope) {
|
||||
throw new RuntimeException('The validated object is not an instance of roleScope');
|
||||
}
|
||||
|
||||
if (! $constraint instanceof RoleScopeScopePresenceConstraint) {
|
||||
throw new \RuntimeException('This validator should be used with RoleScopScopePresenceConstraint');
|
||||
|
||||
if (!$constraint instanceof RoleScopeScopePresenceConstraint) {
|
||||
throw new RuntimeException('This validator should be used with RoleScopScopePresenceConstraint');
|
||||
}
|
||||
|
||||
|
||||
$this->logger->debug('begin validation of a role scope instance');
|
||||
|
||||
|
||||
//if the role scope should have a scope
|
||||
if (
|
||||
!in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes())
|
||||
&&
|
||||
$value->getScope() === NULL
|
||||
&& $value->getScope() === null
|
||||
) {
|
||||
$this->context->buildViolation($constraint->messagePresenceRequired)
|
||||
->setParameter('%role%', $this->translator->trans($value->getRole()))
|
||||
->addViolation();
|
||||
->setParameter('%role%', $this->translator->trans($value->getRole()))
|
||||
->addViolation();
|
||||
$this->logger->debug('the role scope should have a scope, but scope is null. Violation build.');
|
||||
} elseif // if the scope should be null
|
||||
(
|
||||
in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes())
|
||||
&&
|
||||
! is_null($value->getScope())
|
||||
)
|
||||
{
|
||||
&& !is_null($value->getScope())
|
||||
) {
|
||||
$this->context->buildViolation($constraint->messageNullRequired)
|
||||
->setParameter('%role%', $this->translator->trans($value->getRole()))
|
||||
->addViolation();
|
||||
->setParameter('%role%', $this->translator->trans($value->getRole()))
|
||||
->addViolation();
|
||||
$this->logger->debug('the role scole should not have a scope, but scope is not null. Violation build.');
|
||||
} // everything is fine !
|
||||
else {
|
||||
$this->logger->debug('role scope is valid. Validation finished.');
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -1,117 +1,105 @@
|
||||
<?php
|
||||
/*
|
||||
* Copyright (C) 2018 Julien Fastré <julien.fastre@champs-libres.coop>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
namespace Chill\MainBundle\Validation\Validator;
|
||||
|
||||
use Symfony\Component\Validator\ConstraintValidator;
|
||||
use Symfony\Component\Validator\Constraint;
|
||||
use Chill\MainBundle\Entity\User;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
|
||||
/**
|
||||
*
|
||||
* Chill is a software for social workers
|
||||
*
|
||||
* @author Julien Fastré <julien.fastre@champs-libres.coop>
|
||||
* For the full copyright and license information, please view
|
||||
* the LICENSE file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Chill\MainBundle\Validation\Validator;
|
||||
|
||||
use Chill\MainBundle\Entity\User;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Symfony\Component\Validator\Constraint;
|
||||
use Symfony\Component\Validator\ConstraintValidator;
|
||||
use UnexpectedValueException;
|
||||
|
||||
class UserUniqueEmailAndUsername extends ConstraintValidator
|
||||
{
|
||||
/**
|
||||
*
|
||||
* @var EntityManagerInterface
|
||||
*/
|
||||
protected $em;
|
||||
|
||||
|
||||
public function __construct(EntityManagerInterface $em)
|
||||
{
|
||||
$this->em = $em;
|
||||
}
|
||||
|
||||
|
||||
public function validate($value, Constraint $constraint)
|
||||
{
|
||||
if (!$value instanceof User) {
|
||||
throw new \UnexpectedValueException("This validation should happens "
|
||||
. "only on class ".User::class);
|
||||
throw new UnexpectedValueException('This validation should happens '
|
||||
. 'only on class ' . User::class);
|
||||
}
|
||||
|
||||
|
||||
if ($value->getId() !== null) {
|
||||
$countUsersByUsername = $this->em->createQuery(
|
||||
sprintf(
|
||||
"SELECT COUNT(u) FROM %s u "
|
||||
. "WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) "
|
||||
. "AND u != :user",
|
||||
User::class)
|
||||
'SELECT COUNT(u) FROM %s u '
|
||||
. 'WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) '
|
||||
. 'AND u != :user',
|
||||
User::class
|
||||
)
|
||||
)
|
||||
->setParameter('username', $value->getUsername())
|
||||
->setParameter('user', $value)
|
||||
->getSingleScalarResult();
|
||||
} else {
|
||||
$countUsersByUsername = $this->em->createQuery(
|
||||
sprintf(
|
||||
"SELECT COUNT(u) FROM %s u "
|
||||
. "WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) ",
|
||||
User::class)
|
||||
'SELECT COUNT(u) FROM %s u '
|
||||
. 'WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) ',
|
||||
User::class
|
||||
)
|
||||
)
|
||||
->setParameter('username', $value->getUsername())
|
||||
->getSingleScalarResult();
|
||||
}
|
||||
|
||||
if ($countUsersByUsername > 0) {
|
||||
|
||||
if (0 < $countUsersByUsername) {
|
||||
$this->context
|
||||
->buildViolation($constraint->messageDuplicateUsername)
|
||||
->setParameters([
|
||||
'%username%' => $value->getUsername()
|
||||
'%username%' => $value->getUsername(),
|
||||
])
|
||||
->atPath('username')
|
||||
->addViolation()
|
||||
;
|
||||
->addViolation();
|
||||
}
|
||||
|
||||
|
||||
if ($value->getId() !== null) {
|
||||
$countUsersByEmail = $this->em->createQuery(
|
||||
sprintf(
|
||||
"SELECT COUNT(u) FROM %s u "
|
||||
. "WHERE u.emailCanonical = LOWER(UNACCENT(:email)) "
|
||||
. "AND u != :user",
|
||||
User::class)
|
||||
'SELECT COUNT(u) FROM %s u '
|
||||
. 'WHERE u.emailCanonical = LOWER(UNACCENT(:email)) '
|
||||
. 'AND u != :user',
|
||||
User::class
|
||||
)
|
||||
)
|
||||
->setParameter('email', $value->getEmail())
|
||||
->setParameter('user', $value)
|
||||
->getSingleScalarResult();
|
||||
} else {
|
||||
$countUsersByEmail = $this->em->createQuery(
|
||||
sprintf(
|
||||
"SELECT COUNT(u) FROM %s u "
|
||||
. "WHERE u.emailCanonical = LOWER(UNACCENT(:email))",
|
||||
User::class)
|
||||
'SELECT COUNT(u) FROM %s u '
|
||||
. 'WHERE u.emailCanonical = LOWER(UNACCENT(:email))',
|
||||
User::class
|
||||
)
|
||||
)
|
||||
->setParameter('email', $value->getEmail())
|
||||
->getSingleScalarResult();
|
||||
}
|
||||
|
||||
if ($countUsersByEmail > 0) {
|
||||
|
||||
if (0 < $countUsersByEmail) {
|
||||
$this->context
|
||||
->buildViolation($constraint->messageDuplicateEmail)
|
||||
->setParameters([
|
||||
'%email%' => $value->getEmail()
|
||||
'%email%' => $value->getEmail(),
|
||||
])
|
||||
->atPath('email')
|
||||
->addViolation()
|
||||
;
|
||||
->addViolation();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -1,41 +1,29 @@
|
||||
<?php
|
||||
/*
|
||||
* Copyright (C) 2018 Champs-Libres <info@champs-libres.coop>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
namespace Chill\MainBundle\Validation\Validator;
|
||||
|
||||
use Symfony\Component\Validator\ConstraintValidator;
|
||||
use Symfony\Component\Validator\Constraint;
|
||||
use Chill\MainBundle\Phonenumber\PhonenumberHelper;
|
||||
use Psr\Log\LoggerInterface;
|
||||
|
||||
/**
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
namespace Chill\MainBundle\Validation\Validator;
|
||||
|
||||
use Chill\MainBundle\Phonenumber\PhonenumberHelper;
|
||||
use LogicException;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use Symfony\Component\Validator\Constraint;
|
||||
use Symfony\Component\Validator\ConstraintValidator;
|
||||
|
||||
class ValidPhonenumber extends ConstraintValidator
|
||||
{
|
||||
protected $logger;
|
||||
|
||||
/**
|
||||
*
|
||||
* @var PhonenumberHelper
|
||||
*/
|
||||
protected $phonenumberHelper;
|
||||
|
||||
protected $logger;
|
||||
|
||||
|
||||
public function __construct(
|
||||
LoggerInterface $logger,
|
||||
PhonenumberHelper $phonenumberHelper
|
||||
@@ -43,45 +31,49 @@ class ValidPhonenumber extends ConstraintValidator
|
||||
$this->phonenumberHelper = $phonenumberHelper;
|
||||
$this->logger = $logger;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @param string $value
|
||||
* @param \Chill\MainBundle\Validation\Constraint\PhonenumberConstraint $constraint
|
||||
*/
|
||||
public function validate($value, Constraint $constraint)
|
||||
{
|
||||
if (FALSE === $this->phonenumberHelper->isPhonenumberValidationConfigured()) {
|
||||
if (false === $this->phonenumberHelper->isPhonenumberValidationConfigured()) {
|
||||
$this->logger->debug('[phonenumber] skipping validation due to not configured helper');
|
||||
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (empty($value)) {
|
||||
return;
|
||||
}
|
||||
|
||||
switch($constraint->type) {
|
||||
|
||||
switch ($constraint->type) {
|
||||
case 'landline':
|
||||
$isValid = $this->phonenumberHelper->isValidPhonenumberLandOrVoip($value);
|
||||
$message = $constraint->notLandlineMessage;
|
||||
|
||||
break;
|
||||
|
||||
case 'mobile':
|
||||
$isValid = $this->phonenumberHelper->isValidPhonenumberMobile($value);
|
||||
$message = $constraint->notMobileMessage;
|
||||
|
||||
break;
|
||||
|
||||
case 'any':
|
||||
$isValid = $this->phonenumberHelper->isValidPhonenumberAny($value);
|
||||
$message = $constraint->notValidMessage;
|
||||
|
||||
break;
|
||||
|
||||
|
||||
default:
|
||||
throw new \LogicException(sprintf("This type '%s' is not implemented. "
|
||||
throw new LogicException(sprintf("This type '%s' is not implemented. "
|
||||
. "Possible values are 'mobile', 'landline' or 'any'", $constraint->type));
|
||||
}
|
||||
|
||||
if (FALSE === $isValid) {
|
||||
$this->context->addViolation($message, [ '%phonenumber%' => $value ]);
|
||||
|
||||
if (false === $isValid) {
|
||||
$this->context->addViolation($message, ['%phonenumber%' => $value]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user