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;
}
}
}
}