cs: Fix code style (safe rules only).

This commit is contained in:
Pol Dellaiera
2021-11-23 14:06:38 +01:00
parent 149d7ce991
commit 8f96a1121d
1223 changed files with 65199 additions and 64625 deletions

View File

@@ -1,5 +1,12 @@
<?php
/**
* 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\PersonBundle\Validator\Constraints\AccompanyingPeriod;
use Symfony\Component\Validator\Constraint;
@@ -9,9 +16,9 @@ use Symfony\Component\Validator\Constraint;
*/
class LocationValidity extends Constraint
{
public $messagePersonLocatedMustBeAssociated = "The person where the course is located must be associated to the course. Change course's location before removing the person.";
public $messagePeriodMustRemainsLocated = 'The period must remain located';
public $messagePeriodMustRemainsLocated = "The period must remain located";
public $messagePersonLocatedMustBeAssociated = "The person where the course is located must be associated to the course. Change course's location before removing the person.";
public function getTargets()
{

View File

@@ -1,13 +1,20 @@
<?php
/**
* 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\PersonBundle\Validator\Constraints\AccompanyingPeriod;
use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\PersonBundle\Templating\Entity\PersonRender;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintValidator;
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
use Symfony\Component\Validator\Exception\UnexpectedValueException;
use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\PersonBundle\Templating\Entity\PersonRender;
class LocationValidityValidator extends ConstraintValidator
{
@@ -30,25 +37,24 @@ class LocationValidityValidator extends ConstraintValidator
if ($period->getLocationStatus() === 'person') {
if (null === $period->getOpenParticipationContainsPerson(
$period->getPersonLocation())) {
$period->getPersonLocation()
)) {
$this->context->buildViolation($constraint->messagePersonLocatedMustBeAssociated)
->setParameter('{{ person_name }}', $this->render->renderString(
$period->getPersonLocation(), []
))
->addViolation()
;
->setParameter('{{ person_name }}', $this->render->renderString(
$period->getPersonLocation(),
[]
))
->addViolation();
}
}
if ($period->getStep() !== AccompanyingPeriod::STEP_DRAFT
&& $period->getLocationStatus() === 'none') {
$this->context
->buildViolation(
$constraint->messagePeriodMustRemainsLocated
)
->addViolation()
;
->buildViolation(
$constraint->messagePeriodMustRemainsLocated
)
->addViolation();
}
}
}

View File

@@ -1,15 +1,22 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
use Symfony\Component\Validator\Constraint;
/**
* @Annotation
*/
class ParticipationOverlap extends Constraint
{
public $message = 'This participation already exists.';
}
}

View File

@@ -1,11 +1,18 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
use Chill\MainBundle\Util\DateRangeCovering;
use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOverlap;
use Doctrine\Common\Collections\Collection;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintValidator;
@@ -33,7 +40,6 @@ class ParticipationOverlapValidator extends ConstraintValidator
$participationList = [];
foreach ($participations as $participation) {
if (!$participation instanceof AccompanyingPeriodParticipation) {
throw new UnexpectedTypeException($participation, AccompanyingPeriodParticipation::class);
}
@@ -41,7 +47,6 @@ class ParticipationOverlapValidator extends ConstraintValidator
$personId = $participation->getPerson()->getId();
$participationList[$personId][] = $participation;
}
foreach ($participationList as $group) {
@@ -55,19 +60,18 @@ class ParticipationOverlapValidator extends ConstraintValidator
$overlaps->compute();
if ($overlaps->hasIntersections()) {
foreach ($overlaps->getIntersections() as list($start, $end, $ids)) {
$msg = $end === null ? $constraint->message :
foreach ($overlaps->getIntersections() as [$start, $end, $ids]) {
$msg = null === $end ? $constraint->message :
$constraint->message;
$this->context->buildViolation($msg)
->setParameters([
'{{ start }}' => $start->format('d-m-Y'),
'{{ end }}' => $end === null ? null : $end->format('d-m-Y'),
'{{ end }}' => null === $end ? null : $end->format('d-m-Y'),
'{{ ids }}' => $ids,
])
->addViolation();
}
}
}
}

View File

@@ -1,11 +1,18 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
use Symfony\Component\Validator\Constraint;
/**
* @Annotation
*/
@@ -13,4 +20,3 @@ class ResourceDuplicateCheck extends Constraint
{
public $message = '{{ name }} is already associated to this accompanying course.';
}

View File

@@ -1,21 +1,29 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
use Chill\PersonBundle\Entity\Person;
use Chill\PersonBundle\Templating\Entity\PersonRender;
use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
use Doctrine\Common\Collections\Collection;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintValidator;
use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ResourceDuplicateCheck;
use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
use function in_array;
class ResourceDuplicateCheckValidator extends ConstraintValidator
{
private PersonRender $personRender;
private ThirdPartyRender $thirdpartyRender;
public function __construct(PersonRender $personRender, ThirdPartyRender $thirdPartyRender)
@@ -38,19 +46,16 @@ class ResourceDuplicateCheckValidator extends ConstraintValidator
foreach ($resources as $resource) {
$id = ($resource->getResource() instanceof Person ? 'p' :
't').$resource->getResource()->getId();
't') . $resource->getResource()->getId();
if (\in_array($id, $resourceList, true)) {
if (in_array($id, $resourceList, true)) {
$this->context->buildViolation($constraint->message)
->setParameter('{{ name }}', $resource->getResource() instanceof Person ? $this->personRender->renderString($resource->getResource(), []) :
->setParameter('{{ name }}', $resource->getResource() instanceof Person ? $this->personRender->renderString($resource->getResource(), []) :
$this->thirdpartyRender->renderString($resource->getResource(), []))
->addViolation();
}
$resourceList[] = $id;
}
}
}
}

View File

@@ -1,5 +1,12 @@
<?php
/**
* 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\PersonBundle\Validator\Constraints\Household;
use Symfony\Component\Validator\Constraint;
@@ -13,6 +20,6 @@ class HouseholdMembershipSequential extends Constraint
public function getTargets()
{
return [ self::CLASS_CONSTRAINT ];
return [self::CLASS_CONSTRAINT];
}
}

View File

@@ -1,18 +1,24 @@
<?php
/**
* 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\PersonBundle\Validator\Constraints\Household;
use Chill\PersonBundle\Entity\Person;
use Chill\MainBundle\Util\DateRangeCovering;
use Chill\PersonBundle\Entity\Person;
use Chill\PersonBundle\Templating\Entity\PersonRender;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintValidator;
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
use Symfony\Component\Validator\Exception\UnexpectedValueException;
/**
* Validate that a person does not belong to two household at
* the same time
* Validate that a person does not belong to two household at
* the same time.
*/
class HouseholdMembershipSequentialValidator extends ConstraintValidator
{
@@ -45,7 +51,7 @@ class HouseholdMembershipSequentialValidator extends ConstraintValidator
$covers->compute();
if ($covers->hasIntersections()) {
foreach ($covers->getIntersections() as list($start, $end, $metadata)) {
foreach ($covers->getIntersections() as [$start, $end, $metadata]) {
$participation = $participations[$metadata[0]];
$nbHousehold = count($metadata);
@@ -53,15 +59,14 @@ class HouseholdMembershipSequentialValidator extends ConstraintValidator
->buildViolation($constraint->message)
->setParameters([
'%person_name%' => $this->render->renderString(
$participation->getPerson(), []
$participation->getPerson(),
[]
),
// TODO when date is correctly i18n, fix this
'%from%' => $start->format('d-m-Y'),
'%nbHousehold%' => $nbHousehold,
])
->addViolation()
;
->addViolation();
}
}
}

View File

@@ -1,5 +1,12 @@
<?php
/**
* 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\PersonBundle\Validator\Constraints\Household;
use Symfony\Component\Validator\Constraint;
@@ -10,6 +17,7 @@ use Symfony\Component\Validator\Constraint;
class MaxHolder extends Constraint
{
public $message = 'household.max_holder_overflowed';
public $messageInfinity = 'household.max_holder_overflowed_infinity';
public function getTargets()

View File

@@ -1,12 +1,17 @@
<?php
/**
* 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\PersonBundle\Validator\Constraints\Household;
use Chill\MainBundle\Util\DateRangeCovering;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintValidator;
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
use Symfony\Component\Validator\Exception\UnexpectedValueException;
class MaxHolderValidator extends ConstraintValidator
{
@@ -20,8 +25,10 @@ class MaxHolderValidator extends ConstraintValidator
return;
}
$covers = new DateRangeCovering(self::MAX_HOLDERS,
$holders[0]->getStartDate()->getTimezone());
$covers = new DateRangeCovering(
self::MAX_HOLDERS,
$holders[0]->getStartDate()->getTimezone()
);
foreach ($holders as $key => $member) {
$covers->add($member->getStartDate(), $member->getEndDate(), $key);
@@ -30,18 +37,17 @@ class MaxHolderValidator extends ConstraintValidator
$covers->compute();
if ($covers->hasIntersections()) {
foreach ($covers->getIntersections() as list($start, $end, $ids)) {
$msg = $end === null ? $constraint->messageInfinity :
foreach ($covers->getIntersections() as [$start, $end, $ids]) {
$msg = null === $end ? $constraint->messageInfinity :
$constraint->message;
$this->context->buildViolation($msg)
->setParameters([
'{{ start }}' => $start->format('d-m-Y'), // TODO fix when MessageParameter works with timezone
'{{ end }}' => $end === null ? null : $end->format('d-m-Y')
'{{ end }}' => null === $end ? null : $end->format('d-m-Y'),
])
->addViolation();
}
}
}
}

View File

@@ -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\PersonBundle\Validator\Constraints\Person;
@@ -35,5 +25,5 @@ class Birthdate extends Constraint
{
public const BIRTHDATE_INVALID_CODE = '3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4';
public $message = "The birthdate must be before %date%";
public $message = 'The birthdate must be before %date%';
}

View File

@@ -1,35 +1,23 @@
<?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\PersonBundle\Validator\Constraints\Person;
use DateInterval;
use DateTime;
use LogicException;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintValidator;
/**
*
*
* @author Julien Fastré <julien.fastre@champs-libres.coop>
*/
class BirthdateValidator extends ConstraintValidator
{
private $interval_spec = null;
private $interval_spec;
public function __construct($interval_spec = null)
{
@@ -38,13 +26,12 @@ class BirthdateValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if ($value === NULL) {
if (null === $value) {
return;
}
if (!$value instanceof \DateTime) {
throw new \LogicException('The input should a be a \DateTime interface,'
if (!$value instanceof DateTime) {
throw new LogicException('The input should a be a \DateTime interface,'
. (is_object($value) ? get_class($value) : gettype($value)));
}
@@ -56,21 +43,19 @@ class BirthdateValidator extends ConstraintValidator
->setCode(Birthdate::BIRTHDATE_INVALID_CODE)
->addViolation();
}
}
/**
*
* @return \DateTime
* @return DateTime
*/
private function getLimitDate()
{
if ($this->interval_spec !== NULL) {
$interval = new \DateInterval($this->interval_spec);
return (new \DateTime('now'))->sub($interval);
} else {
return (new \DateTime('now'));
}
}
if (null !== $this->interval_spec) {
$interval = new DateInterval($this->interval_spec);
return (new DateTime('now'))->sub($interval);
}
return new DateTime('now');
}
}

View File

@@ -1,5 +1,12 @@
<?php
/**
* 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\PersonBundle\Validator\Constraints\Person;
/**
@@ -7,12 +14,12 @@ namespace Chill\PersonBundle\Validator\Constraints\Person;
*/
class PersonHasCenter extends \Symfony\Component\Validator\Constraint
{
public string $message = "A center is required";
public string $message = 'A center is required';
public function getTargets()
{
return [
self::CLASS_CONSTRAINT
self::CLASS_CONSTRAINT,
];
}
}

View File

@@ -1,5 +1,12 @@
<?php
/**
* 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.
*/
declare(strict_types=1);
namespace Chill\PersonBundle\Validator\Constraints\Person;
@@ -14,6 +21,7 @@ use Symfony\Component\Validator\Exception\UnexpectedTypeException;
class PersonHasCenterValidator extends ConstraintValidator
{
private bool $centerRequired;
private CenterResolverDispatcherInterface $centerResolverDispatcher;
public function __construct(ParameterBagInterface $parameterBag, CenterResolverDispatcherInterface $centerResolverDispatcher)
@@ -22,9 +30,6 @@ class PersonHasCenterValidator extends ConstraintValidator
$this->centerResolverDispatcher = $centerResolverDispatcher;
}
/**
* @inheritDoc
*/
public function validate($person, Constraint $constraint)
{
if (!$person instanceof Person) {
@@ -35,7 +40,7 @@ class PersonHasCenterValidator extends ConstraintValidator
return;
}
if (NULL === $this->centerResolverDispatcher->resolveCenter($person)) {
if (null === $this->centerResolverDispatcher->resolveCenter($person)) {
$this
->context
->buildViolation($constraint->message)