From e68c12e0e7cd80b022c363d514f9605eecffccbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 25 Mar 2022 13:39:27 +0100 Subject: [PATCH] fix cs --- .../ChillActivityBundle/Form/ActivityType.php | 8 +- .../Menu/AccompanyingCourseMenuBuilder.php | 2 +- .../Entity/Person/PersonResource.php | 1 - .../Menu/AccompanyingCourseMenuBuilder.php | 5 +- .../Authorization/AccompanyingPeriodVoter.php | 22 ++--- .../Entity/ThirdParty.php | 2 +- .../migrations/Version20220324175549.php | 86 ++++++++++--------- 7 files changed, 65 insertions(+), 61 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php index 3a772d878..1e1daead5 100644 --- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php +++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php @@ -126,7 +126,7 @@ class ActivityType extends AbstractType if ($activityType->isVisible('socialIssues') && $accompanyingPeriod) { $builder->add('socialIssues', HiddenType::class, [ - 'required' => $activityType->getSocialIssuesVisible() === 2 + 'required' => $activityType->getSocialIssuesVisible() === 2, ]); $builder->get('socialIssues') ->addModelTransformer(new CallbackTransformer( @@ -154,7 +154,7 @@ class ActivityType extends AbstractType if ($activityType->isVisible('socialActions') && $accompanyingPeriod) { $builder->add('socialActions', HiddenType::class, [ - 'required' => $activityType->getSocialActionsVisible() === 2 + 'required' => $activityType->getSocialActionsVisible() === 2, ]); $builder->get('socialActions') ->addModelTransformer(new CallbackTransformer( @@ -344,8 +344,8 @@ class ActivityType extends AbstractType if ($activityType->isVisible('location')) { $builder->add('location', HiddenType::class, [ - 'required' => $activityType->getLocationVisible() === 2 - ]) + 'required' => $activityType->getLocationVisible() === 2, + ]) ->get('location') ->addModelTransformer(new CallbackTransformer( static function (?Location $location): string { diff --git a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php index cc365b62d..3bf1850a4 100644 --- a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php +++ b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php @@ -48,7 +48,7 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface 'accompanying_period_id' => $period->getId(), ], ]) ->setExtras(['order' => 35]); - */ + */ } } diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php index 73bd23106..b1022cf4c 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php +++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php @@ -232,7 +232,6 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface } if (null !== $this->person && $this->person === $this->personOwner) { - $context->buildViolation('You cannot associate a resource with the same person') ->addViolation(); } diff --git a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php index 34667d636..57be8fecf 100644 --- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php +++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php @@ -102,7 +102,7 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface 'route' => 'chill_person_accompanying_course_close', 'routeParameters' => [ 'accompanying_period_id' => $period->getId(), - ],]) + ], ]) ->setExtras(['order' => 99999]); } } @@ -113,10 +113,9 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface 'route' => 'chill_person_accompanying_course_reopen', 'routeParameters' => [ 'accompanying_period_id' => $period->getId(), - ],]) + ], ]) ->setExtras(['order' => 99998]); } - } public static function getMenuIds(): array diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php index 2e896c471..e53d40eee 100644 --- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php +++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php @@ -40,7 +40,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH public const CREATE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_CREATE'; /** - * role to DELETE the course + * role to DELETE the course. * * Will be true only for the creator, and if the course is still at DRAFT step. */ @@ -58,6 +58,14 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH */ public const FULL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_FULL'; + /** + * Reopen a closed course. + * + * This forward to the EDIT role, without taking into account that the course + * is closed + */ + public const RE_OPEN_COURSE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_REOPEN'; + public const SEE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE'; /** @@ -67,14 +75,6 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH */ public const SEE_DETAILS = 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_DETAILS'; - /** - * Reopen a closed course. - * - * This forward to the EDIT role, without taking into account that the course - * is closed - */ - public const RE_OPEN_COURSE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_REOPEN'; - public const TOGGLE_CONFIDENTIAL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL'; /** @@ -154,8 +154,8 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH } if (in_array($attribute, [ - self::SEE, self::SEE_DETAILS, self::EDIT - ])) { + self::SEE, self::SEE_DETAILS, self::EDIT, + ], true)) { if ($subject->getUser() === $token->getUser()) { return true; } diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php index d7efce10c..16260ec97 100644 --- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php +++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php @@ -198,7 +198,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface private ?string $email = null; /** - * @ORM\Column(name="firstname", type="text", options={"default":""}) + * @ORM\Column(name="firstname", type="text", options={"default": ""}) * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"}) */ private string $firstname = ''; diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20220324175549.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220324175549.php index e31b950d4..ae91699aa 100644 --- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20220324175549.php +++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220324175549.php @@ -1,5 +1,12 @@ addSql(" + CREATE OR REPLACE FUNCTION chill_3party.canonicalize() RETURNS TRIGGER + LANGUAGE plpgsql + AS + $$ + BEGIN + NEW.canonicalized = + UNACCENT( + LOWER( + NEW.name || + CASE WHEN COALESCE(NEW.name_company, '') <> '' THEN ' ' ELSE '' END || + COALESCE(NEW.name_company, '') || + CASE WHEN COALESCE(NEW.acronym, '') <> '' THEN ' ' ELSE '' END || + COALESCE(NEW.acronym, '') + ) + ) + ; + + return NEW; + END + $$ + "); + $this->addSql(" + UPDATE chill_3party.third_party + SET canonicalized = + UNACCENT( + LOWER( + name || + CASE WHEN COALESCE(name_company, '') <> '' THEN ' ' ELSE '' END || + COALESCE(name_company, '') || + CASE WHEN COALESCE(acronym, '') <> '' THEN ' ' ELSE '' END || + COALESCE(acronym, '') + ) + ) + "); + } + public function getDescription(): string { return 'indexing of firstname on third parties'; @@ -55,45 +101,5 @@ final class Version20220324175549 extends AbstractMigration END $$ "); - - } - - public function down(Schema $schema): void - { - $this->addSql(" - CREATE OR REPLACE FUNCTION chill_3party.canonicalize() RETURNS TRIGGER - LANGUAGE plpgsql - AS - $$ - BEGIN - NEW.canonicalized = - UNACCENT( - LOWER( - NEW.name || - CASE WHEN COALESCE(NEW.name_company, '') <> '' THEN ' ' ELSE '' END || - COALESCE(NEW.name_company, '') || - CASE WHEN COALESCE(NEW.acronym, '') <> '' THEN ' ' ELSE '' END || - COALESCE(NEW.acronym, '') - ) - ) - ; - - return NEW; - END - $$ - "); - $this->addSql(" - UPDATE chill_3party.third_party - SET canonicalized = - UNACCENT( - LOWER( - name || - CASE WHEN COALESCE(name_company, '') <> '' THEN ' ' ELSE '' END || - COALESCE(name_company, '') || - CASE WHEN COALESCE(acronym, '') <> '' THEN ' ' ELSE '' END || - COALESCE(acronym, '') - ) - ) - "); } }