diff --git a/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php b/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php index 148a1fe35..0a46c4496 100644 --- a/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php +++ b/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php @@ -14,6 +14,7 @@ use Symfony\Component\Security\Core\Role\Role; use Symfony\Component\Security\Core\Role\RoleHierarchy; use Chill\MainBundle\Entity\Scope; use Chill\MainBundle\Form\Type\ComposedRoleScopeType; +use Symfony\Component\Validator\Validator\ValidatorInterface; use Symfony\Contracts\Translation\TranslatorInterface; /** @@ -43,6 +44,11 @@ class PermissionsGroupController extends AbstractController */ private $translator; + /** + * @var ValidatorInterface + */ + private $validator; + /** * PermissionsGroupController constructor. * @@ -50,18 +56,21 @@ class PermissionsGroupController extends AbstractController * @param RoleProvider $roleProvider * @param RoleHierarchy $roleHierarchy * @param TranslatorInterface $translator + * @param ValidatorInterface $validator */ public function __construct( TranslatableStringHelper $translatableStringHelper, RoleProvider $roleProvider, RoleHierarchy $roleHierarchy, - TranslatorInterface $translator + TranslatorInterface $translator, + ValidatorInterface $validator ) { $this->translatableStringHelper = $translatableStringHelper; $this->roleProvider = $roleProvider; $this->roleHierarchy = $roleHierarchy; $this->translator = $translator; + $this->validator = $validator; } /** @@ -452,7 +461,7 @@ class PermissionsGroupController extends AbstractController ); $permissionsGroup->addRoleScope($roleScope); - $violations = $this->get('validator')->validate($permissionsGroup); + $violations = $this->validator->validate($permissionsGroup); if ($violations->count() === 0) { $em->flush(); diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php index 93ed2fa62..7de280d1d 100644 --- a/src/Bundle/ChillMainBundle/Controller/UserController.php +++ b/src/Bundle/ChillMainBundle/Controller/UserController.php @@ -11,6 +11,7 @@ use Chill\MainBundle\Form\UserType; use Chill\MainBundle\Entity\GroupCenter; use Chill\MainBundle\Form\Type\ComposedGroupCenterType; use Chill\MainBundle\Form\UserPasswordType; +use Symfony\Component\Validator\Validator\ValidatorInterface; /** @@ -28,14 +29,21 @@ class UserController extends AbstractController */ private $logger; + /** + * @var ValidatorInterface + */ + private $validator; + /** * UserController constructor. * * @param LoggerInterface $logger + * @param ValidatorInterface $validator */ - public function __construct(LoggerInterface $logger) + public function __construct(LoggerInterface $logger, ValidatorInterface $validator) { $this->logger = $logger; + $this->validator = $validator; } /** @@ -258,7 +266,7 @@ class UserController extends AbstractController $form[self::FORM_GROUP_CENTER_COMPOSED]->getData()); $user->addGroupCenter($groupCenter); - if ($this->get('validator')->validate($user)->count() === 0) { + if ($this->validator->validate($user)->count() === 0) { $em->flush(); $this->addFlash('success', $this->get('translator')->trans('The ' @@ -267,7 +275,7 @@ class UserController extends AbstractController return $this->redirect($this->generateUrl('admin_user_edit', array('id' => $uid))); } else { - foreach($this->get('validator')->validate($user) as $error) + foreach($this->validator->validate($user) as $error) $this->addFlash('error', $error->getMessage()); } } @@ -380,7 +388,7 @@ class UserController extends AbstractController // logging for prod $this->logger->info('update password for an user', [ - 'by' => $this->getUser()->getUsername(), + 'by' => $this->getUser()->getUsername(), 'user' => $user->getUsername() ]); diff --git a/src/Bundle/ChillMainBundle/config/services/controller.yaml b/src/Bundle/ChillMainBundle/config/services/controller.yaml index 90630ff03..5fb542786 100644 --- a/src/Bundle/ChillMainBundle/config/services/controller.yaml +++ b/src/Bundle/ChillMainBundle/config/services/controller.yaml @@ -1,16 +1,16 @@ services: - + Chill\MainBundle\Controller\: autowire: true resource: '../../Controller' tags: ['controller.service_arguments'] - + Chill\MainBundle\Controller\PasswordController: autowire: true arguments: $chillLogger: '@monolog.logger.chill' tags: ['controller.service_arguments'] - + Chill\MainBundle\Controller\SearchController: arguments: $searchProvider: '@chill_main.search_provider' @@ -24,9 +24,11 @@ services: $roleProvider: '@chill.main.role_provider' $roleHierarchy: '@security.role_hierarchy' $translator: '@Symfony\Contracts\Translation\TranslatorInterface' + $validator: '@Symfony\Component\Validator\Validator\ValidatorInterface' tags: ['controller.service_arguments'] Chill\MainBundle\Controller\UserController: arguments: $logger: '@Psr\Log\LoggerInterface' - tags: ['controller.service_arguments'] \ No newline at end of file + $validator: '@Symfony\Component\Validator\Validator\ValidatorInterface' + tags: ['controller.service_arguments'] diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php index 2f6925373..a7c4d9d50 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php @@ -32,6 +32,7 @@ use Chill\PersonBundle\Security\Authorization\PersonVoter; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\Validator\Validator\ValidatorInterface; /** * Class AccompanyingPeriodController @@ -46,13 +47,20 @@ class AccompanyingPeriodController extends AbstractController protected $eventDispatcher; /** - * ReportController constructor. + * @var ValidatorInterface + */ + protected $validator; + + /** + * AccompanyingPeriodController constructor. * * @param EventDispatcherInterface $eventDispatcher + * @param ValidatorInterface $validator */ - public function __construct(EventDispatcherInterface $eventDispatcher) + public function __construct(EventDispatcherInterface $eventDispatcher, ValidatorInterface $validator) { $this->eventDispatcher = $eventDispatcher; + $this->validator = $validator; } /** @@ -285,12 +293,14 @@ class AccompanyingPeriodController extends AbstractController * @param Person $person * @return \Symfony\Component\Validator\ConstraintViolationListInterface */ - private function _validatePerson(Person $person) { - $errors = $this->get('validator')->validate($person, null, + private function _validatePerson(Person $person) + { + $errors = $this->validator->validate($person, null, array('Default')); - $errors_accompanying_period = $this->get('validator')->validate($person, null, - array('accompanying_period_consistent')); + $errors_accompanying_period = $this->validator->validate($person, null, + array('accompanying_period_consistent')); + foreach($errors_accompanying_period as $error ) { $errors->add($error); } diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php b/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php index fb8a80da1..f68e1ee9b 100644 --- a/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php +++ b/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php @@ -29,6 +29,7 @@ use Chill\MainBundle\Form\Type\AddressType; use Chill\MainBundle\Entity\Address; use Doctrine\Common\Collections\Criteria; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Validator\Validator\ValidatorInterface; /** * Class PersonAddressController @@ -40,7 +41,21 @@ use Symfony\Component\HttpFoundation\Request; */ class PersonAddressController extends AbstractController { - + /** + * @var ValidatorInterface + */ + protected $validator; + + /** + * PersonAddressController constructor. + * + * @param ValidatorInterface $validator + */ + public function __construct(ValidatorInterface $validator) + { + $this->validator = $validator; + } + public function listAction($person_id) { $person = $this->getDoctrine()->getManager() @@ -302,9 +317,9 @@ class PersonAddressController extends AbstractController */ private function validatePerson(Person $person) { - $errors = $this->get('validator') + $errors = $this->validator ->validate($person, null, array('Default')); - $errors_addresses_consistent = $this->get('validator') + $errors_addresses_consistent = $this->validator ->validate($person, null, array('addresses_consistent')); foreach($errors_addresses_consistent as $error) { diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php index 28a960520..f9fb98849 100644 --- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php +++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php @@ -38,6 +38,7 @@ use Symfony\Component\Translation\TranslatorInterface; use Chill\MainBundle\Search\SearchProvider; use Chill\PersonBundle\Repository\PersonRepository; use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper; +use Symfony\Component\Validator\Validator\ValidatorInterface; /** * Class PersonController @@ -80,6 +81,11 @@ class PersonController extends AbstractController * @var \Psr\Log\LoggerInterface */ private $logger; + + /** + * @var ValidatorInterface + */ + private $validator; public function __construct( SimilarPersonMatcher $similarPersonMatcher, @@ -87,7 +93,8 @@ class PersonController extends AbstractController EventDispatcherInterface $eventDispatcher, PersonRepository $personRepository, ConfigPersonAltNamesHelper $configPersonAltNameHelper, - LoggerInterface $logger + LoggerInterface $logger, + ValidatorInterface $validator ) { $this->similarPersonMatcher = $similarPersonMatcher; $this->translator = $translator; @@ -95,6 +102,7 @@ class PersonController extends AbstractController $this->configPersonAltNameHelper = $configPersonAltNameHelper; $this->personRepository = $personRepository; $this->logger = $logger; + $this->validator = $validator; } public function getCFGroup() @@ -267,14 +275,14 @@ class PersonController extends AbstractController */ private function _validatePersonAndAccompanyingPeriod(Person $person) { - $errors = $this->get('validator') + $errors = $this->validator ->validate($person, null, array('creation')); //validate accompanying periods $periods = $person->getAccompanyingPeriods(); foreach ($periods as $period) { - $period_errors = $this->get('validator') + $period_errors = $this->validator ->validate($period); //group errors : diff --git a/src/Bundle/ChillPersonBundle/config/services/controller.yaml b/src/Bundle/ChillPersonBundle/config/services/controller.yaml index 13713f3fd..812440bee 100644 --- a/src/Bundle/ChillPersonBundle/config/services/controller.yaml +++ b/src/Bundle/ChillPersonBundle/config/services/controller.yaml @@ -7,6 +7,7 @@ services: $personRepository: '@Chill\PersonBundle\Repository\PersonRepository' $configPersonAltNameHelper: '@Chill\PersonBundle\Config\ConfigPersonAltNamesHelper' $logger: '@Psr\Log\LoggerInterface' + $validator: '@Symfony\Component\Validator\Validator\ValidatorInterface' tags: ['controller.service_arguments'] Chill\PersonBundle\Controller\TimelinePersonController: @@ -19,6 +20,12 @@ services: Chill\PersonBundle\Controller\AccompanyingPeriodController: arguments: $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface' + $validator: '@Symfony\Component\Validator\Validator\ValidatorInterface' + tags: ['controller.service_arguments'] + + Chill\PersonBundle\Controller\PersonAddressController: + arguments: + $validator: '@Symfony\Component\Validator\Validator\ValidatorInterface' tags: ['controller.service_arguments'] Chill\PersonBundle\Controller\AdminController: ~