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

Merge branch 'dune-risky'

Browse Source 
Conflicts:
	src/Bundle/ChillActivityBundle/config/services.yaml
	src/Bundle/ChillPersonBundle/translations/messages.fr.yml
This commit is contained in:
Julien Fastré
2021-06-02 16:23:45 +02:00
parent 126ffc55bf cfd9f1bab1
commit 980a305456
38 changed files with 1267 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -369,13 +369,9 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
return false;
}
public function setRemark(string $remark): self
public function setRemark(string $remark = null): self
{
if ($remark === null) {
$remark = '';
}
$this->remark = $remark;
$this->remark = (string) $remark;
return $this;
}