From 1c7d90a6efbc1a099d6dc5a0df369fbcc44f629d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 28 Apr 2023 23:17:41 +0200 Subject: [PATCH] fixes from a first test --- .../CustomFields/CustomFieldChoice.php | 8 +------- .../ChillPersonBundle/Entity/AccompanyingPeriod.php | 2 +- .../Security/Authorization/AuthorizationEvent.php | 3 ++- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php index 88ef15e3e..8add4b995 100644 --- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php +++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php @@ -370,14 +370,8 @@ class CustomFieldChoice extends AbstractCustomField * * If the value had an 'allow_other' = true option, the returned value * **is not** the content of the _other field, but the `_other` string. - * - * @param array|string $value - * - * @throws LogicException if the case is not covered by this - * - * @return mixed */ - private function guessValue(array|string $value) + private function guessValue(array|string|null $value) { if (null === $value) { return null; diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php index 15970471a..f4c36e7b7 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php @@ -952,7 +952,7 @@ class AccompanyingPeriod implements /** * @Groups({"read"}) */ - public function getRequestor(): \Chill\PersonBundle\Entity\Person|\Chill\ThirdPartyBundle\Entity\ThirdParty + public function getRequestor(): Person|ThirdParty|null { return $this->requestorPerson ?? $this->requestorThirdParty; } diff --git a/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php b/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php index 1607ec56c..d7ccc0db9 100644 --- a/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php +++ b/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php @@ -11,6 +11,7 @@ declare(strict_types=1); namespace Chill\TaskBundle\Security\Authorization; +use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\PersonBundle\Entity\Person; use Chill\TaskBundle\Entity\AbstractTask; use Symfony\Component\EventDispatcher\Event; @@ -26,7 +27,7 @@ class AuthorizationEvent extends Event protected $vote; public function __construct( - private Person|AbstractTask|null $subject, + private Person|AbstractTask|AccompanyingPeriod|null $subject, private string $attribute, private TokenInterface $token ) {