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 'master' into upgrade-php82

Browse Source
This commit is contained in:
Julien Fastré
2023-03-20 12:40:58 +01:00
parent 244614a691 1cc80c8e6a
commit 97a4c39941
18 changed files with 133 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
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']]),
]

2
src/Bundle/ChillCalendarBundle/Tests/Service/DocGenerator/CalendarContextTest.php
View File

@@ -205,7 +205,7 @@ final class CalendarContextTest extends TestCase
?NormalizerInterface $normalizer = null
): CalendarContext {
$baseContext = $this->prophesize(BaseContextData::class);
$baseContext->getData()->willReturn(['base_context' => 'data']);
$baseContext->getData(null)->willReturn(['base_context' => 'data']);
$personRender = $this->prophesize(PersonRender::class);
$personRender->renderString(Argument::type(Person::class), [])->willReturn('person name');