Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2026-04-09 14:33:44 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ticket-app-master' into migrate_to_sf72

Browse Source 
# Conflicts:
#	.gitlab-ci.yml
#	composer.json
#	config/services.yaml
#	phpunit.xml.dist
#	src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
#	src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
#	src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php
#	src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php
#	src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php
#	src/Bundle/ChillJobBundle/src/Entity/Immersion.php
#	src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
#	src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
#	src/Bundle/ChillMainBundle/Entity/Location.php
#	src/Bundle/ChillMainBundle/Routing/MenuComposer.php
#	src/Bundle/ChillMainBundle/Routing/MenuTwig.php
#	src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php
#	src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
#	src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php
#	src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php
#	src/Bundle/ChillPersonBundle/Controller/PersonController.php
#	src/Bundle/ChillPersonBundle/Entity/Person.php
#	src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
#	src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
#	src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
#	src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
#	src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
This commit is contained in:
Julien Fastré
2025-12-22 16:36:57 +01:00
parent 14a0c2b4fd 2b1f337a28
commit 43d6a86627
888 changed files with 64991 additions and 32076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
View File

@@ -26,6 +26,7 @@ class AddressRender implements ChillEntityRenderInterface
'with_delimiter' => false,
'has_no_address' => false,
'multiline' => true,
'separator' => ' — ',
/* deprecated */
'extended_infos' => false,
];
@@ -114,7 +115,9 @@ class AddressRender implements ChillEntityRenderInterface
public function renderString($addr, array $options): string
{
return implode(' — ', $this->renderLines($addr));
$opts = [...self::DEFAULT_OPTIONS, ...$options];
return implode($opts['separator'], $this->renderLines($addr));
}
public function supports($entity, array $options): bool

2
src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
View File

@@ -52,7 +52,7 @@ class CommentRender implements ChillEntityRenderInterface
public function renderString($entity, array $options): string
{
return $entity->getComment();
return (string) $entity->getComment();
}
public function supports($entity, array $options): bool