Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

fixes from a first test

Browse Source
This commit is contained in:
Julien Fastré 2023-04-28 23:17:41 +02:00
parent 24c33b306b
commit 1c7d90a6ef
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
View File

@ -370,14 +370,8 @@ class CustomFieldChoice extends AbstractCustomField
* *
* If the value had an 'allow_other' = true option, the returned value * If the value had an 'allow_other' = true option, the returned value
* **is not** the content of the _other field, but the `_other` string. * **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) { if (null === $value) {
return null; return null;

2
src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
View File

@ -952,7 +952,7 @@ class AccompanyingPeriod implements
/** /**
* @Groups({"read"}) * @Groups({"read"})
*/ */
public function getRequestor(): \Chill\PersonBundle\Entity\Person|\Chill\ThirdPartyBundle\Entity\ThirdParty public function getRequestor(): Person|ThirdParty|null
{ {
return $this->requestorPerson ?? $this->requestorThirdParty; return $this->requestorPerson ?? $this->requestorThirdParty;
} }

3
src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php
View File

@ -11,6 +11,7 @@ declare(strict_types=1);
namespace Chill\TaskBundle\Security\Authorization; namespace Chill\TaskBundle\Security\Authorization;
use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Entity\Person;
use Chill\TaskBundle\Entity\AbstractTask; use Chill\TaskBundle\Entity\AbstractTask;
use Symfony\Component\EventDispatcher\Event; use Symfony\Component\EventDispatcher\Event;
@ -26,7 +27,7 @@ class AuthorizationEvent extends Event
protected $vote; protected $vote;
public function __construct( public function __construct(
private Person|AbstractTask|null $subject, private Person|AbstractTask|AccompanyingPeriod|null $subject,
private string $attribute, private string $attribute,
private TokenInterface $token private TokenInterface $token
) { ) {