Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 14:43:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'fix-accompanying-period-opening' into bootstrap-api

Browse Source
This commit is contained in:
Julien Fastré
2021-05-06 16:02:13 +02:00
parent b6131379f9 e919b4322e
commit 33457d3cbc
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -401,7 +401,7 @@ class AccompanyingPeriod
{
$participation = $this->getOpenParticipationContainsPerson($person);
if (! null === $participation) {
if ($participation instanceof AccompanyingPeriodParticipation) {
$participation->setEndDate(new \DateTimeImmutable('now'));
}

4
src/Bundle/ChillPersonBundle/Entity/Person.php
View File

@@ -390,7 +390,7 @@ class Person implements HasCenterInterface
*
* @deprecated since 1.1 use `getOpenedAccompanyingPeriod instead
*/
public function getCurrentAccompanyingPeriod() : AccompanyingPeriod
public function getCurrentAccompanyingPeriod() : ?AccompanyingPeriod
{
return $this->getOpenedAccompanyingPeriod();
}
@@ -1011,7 +1011,7 @@ class Person implements HasCenterInterface
* By default, the addresses are ordered by date, descending (the most
* recent first)
*/
public function getAddresses(): ArrayCollection
public function getAddresses(): Collection
{
return $this->addresses;
}