Merge remote-tracking branch 'origin/master' into upgrade-sf5

2025-08-30 11:33:49 +00:00 · 2024-04-04 18:45:01 +02:00
parent d6a6cc2572 8fd6986c47
commit 931c69eee4
162 changed files with 3849 additions and 713 deletions
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -95,7 +95,7 @@ class ActivityType extends AbstractType
            ]);
        }

-        /** @var \Chill\PersonBundle\Entity\AccompanyingPeriod|null $accompanyingPeriod */
+        /** @var AccompanyingPeriod|null $accompanyingPeriod */
        $accompanyingPeriod = null;

        if ($options['accompanyingPeriod'] instanceof AccompanyingPeriod) {