From 1cc80c8e6af7149f9c7942612d1f6e18d56cbaea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 16 Mar 2023 00:12:41 +0100 Subject: [PATCH] Fixed: takes all activity into account to check social issue consistency --- .../AccompanyingPeriodValidityValidator.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php index 51462c56e..9454d31d0 100644 --- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php +++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php @@ -54,7 +54,7 @@ class AccompanyingPeriodValidityValidator extends ConstraintValidator $activities = $this->activityRepository->findBy(['accompanyingPeriod' => $period]); foreach ($activities as $activity) { - $socialIssues = $activity->getSocialIssues()->toArray(); + $socialIssues = array_merge($socialIssues, $activity->getSocialIssues()->toArray()); } foreach ($period->getWorks() as $work) { @@ -64,7 +64,7 @@ class AccompanyingPeriodValidityValidator extends ConstraintValidator $socialIssuesByKey = []; foreach ($socialIssues as $si) { - $socialIssuesByKey[$si->getId()] = $si; + $socialIssuesByKey[spl_object_hash($si)] = $si; } $periodIssuesWithAncestors = []; @@ -75,7 +75,7 @@ class AccompanyingPeriodValidityValidator extends ConstraintValidator $periodIssuesWithAncestors, array_map( static function (SocialIssue $si) { - return $si->getId(); + return spl_object_hash($si); }, $si->getAncestors(true) )