Merge branch 'master' into upgrade-php82

This commit is contained in:
2023-03-20 12:40:58 +01:00
18 changed files with 133 additions and 70 deletions

View File

@@ -158,7 +158,7 @@ final class CalendarContext implements CalendarContextInterface
$options = $this->getOptions($template);
$data = array_merge(
$this->baseContextData->getData(),
$this->baseContextData->getData($contextGenerationData['creator'] ?? null),
[
'calendar' => $this->normalizer->normalize($entity, 'docgen', ['docgen:expects' => Calendar::class, 'groups' => ['docgen:read']]),
]