Merge remote-tracking branch 'origin/master' into issue279_accompanying_period_validation

This commit is contained in:
2021-12-06 15:08:56 +01:00
34 changed files with 1066 additions and 122 deletions

View File

@@ -143,7 +143,7 @@ class ActivityType extends AbstractType
return array_map(
fn (string $id): ?SocialIssue => $this->om->getRepository(SocialIssue::class)->findOneBy(['id' => (int) $id]),
explode(',', $socialIssuesAsString)
explode(',', (string) $socialIssuesAsString)
);
}
));
@@ -169,7 +169,7 @@ class ActivityType extends AbstractType
return array_map(
fn (string $id): ?SocialAction => $this->om->getRepository(SocialAction::class)->findOneBy(['id' => (int) $id]),
explode(',', $socialActionsAsString)
explode(',', (string) $socialActionsAsString)
);
}
));
@@ -266,7 +266,7 @@ class ActivityType extends AbstractType
return array_map(
fn (string $id): ?Person => $this->om->getRepository(Person::class)->findOneBy(['id' => (int) $id]),
explode(',', $personsAsString)
explode(',', (string) $personsAsString)
);
}
));
@@ -292,7 +292,7 @@ class ActivityType extends AbstractType
return array_map(
fn (string $id): ?ThirdParty => $this->om->getRepository(ThirdParty::class)->findOneBy(['id' => (int) $id]),
explode(',', $thirdpartyAsString)
explode(',', (string) $thirdpartyAsString)
);
}
));
@@ -329,7 +329,7 @@ class ActivityType extends AbstractType
return array_map(
fn (string $id): ?User => $this->om->getRepository(User::class)->findOneBy(['id' => (int) $id]),
explode(',', $usersAsString)
explode(',', (string) $usersAsString)
);
}
));
@@ -344,7 +344,7 @@ class ActivityType extends AbstractType
return '';
}
return $location->getId();
return (string) $location->getId();
},
function (?string $id): ?Location {
return $this->om->getRepository(Location::class)->findOneBy(['id' => (int) $id]);