Merge branch 'hotfix/v2.4.15'

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to Roadiz will be documented in this file.
 
+## [2.4.15](https://github.com/roadiz/core-bundle-dev-app/compare/v2.4.14...v2.4.15) - 2025-02-17
+
+### Bug Fixes
+
+- **(RozierBundle)** Added configurable csv_encoder_options - ([ebb7fab](https://github.com/roadiz/core-bundle-dev-app/commit/ebb7fab7d9c462a69a7b10769bed1ea3eb86308c))
+
 ## [2.4.14](https://github.com/roadiz/core-bundle-dev-app/compare/v2.4.13...v2.4.14) - 2025-02-13
 
 ### Bug Fixes

config/packages/roadiz_rozier.yaml

@@ -6,6 +6,8 @@ parameters:
     env(OPEN_ID_CLIENT_SECRET): ''
 roadiz_rozier:
     theme_dir: 'lib/Rozier/src'
+    csv_encoder_options:
+        csv_delimiter: ';'
     open_id:
         # Verify User info in JWT at each login
         verify_user_info: false

lib/RoadizCoreBundle/config/services.yaml

@@ -1,6 +1,6 @@
 ---
 parameters:
-    roadiz_core.cms_version: '2.4.14'
+    roadiz_core.cms_version: '2.4.15'
     roadiz_core.cms_version_prefix: 'main'
     env(APP_NAMESPACE): "roadiz"
     env(APP_VERSION): "0.1.0"

lib/RoadizRozierBundle/config/services.yaml

@@ -14,6 +14,7 @@ services:
             $allowNodeTypeEdition: '%kernel.debug%'
             $forceSslOnRedirectUri: '%roadiz_rozier.open_id.force_ssl_on_redirect_uri%'
             $useGravatar: '%roadiz_core.use_gravatar%'
+            $csvEncoderOptions: '%roadiz_rozier.csv_encoder_options%'
 
     RZ\Roadiz\RozierBundle\:
         resource: '../src/'

lib/RoadizRozierBundle/src/DependencyInjection/Configuration.php

@@ -4,14 +4,13 @@
 
 namespace RZ\Roadiz\RozierBundle\DependencyInjection;
 
-use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Themes\Rozier\Forms\Node\AddNodeType;
 use Themes\Rozier\Forms\NodeType;
 
-class Configuration implements ConfigurationInterface
+final class Configuration implements ConfigurationInterface
 {
     public function getConfigTreeBuilder(): TreeBuilder
     {
@@ -59,15 +58,13 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->end() // entries
             ->end()
             ->append($this->addOpenIdNode())
+            ->append($this->addCsvNode())
         ;
 
         return $builder;
     }
 
-    /**
-     * @return ArrayNodeDefinition|NodeDefinition
-     */
-    protected function addOpenIdNode()
+    protected function addOpenIdNode(): NodeDefinition
     {
         $builder = new TreeBuilder('open_id');
         $node = $builder->getRootNode();
@@ -151,4 +148,34 @@ protected function addOpenIdNode()
 
         return $node;
     }
+
+    protected function addCsvNode(): NodeDefinition
+    {
+        $builder = new TreeBuilder('csv_encoder_options');
+        $node = $builder->getRootNode();
+        $builder->getRootNode()->addDefaultsIfNotSet()
+            ->info('https://symfony.com/doc/6.4/serializer/encoders.html#the-csvencoder')
+            ->children()
+                ->scalarNode('csv_delimiter')
+                    ->defaultValue(',')
+                ->end()
+                ->scalarNode('csv_enclosure')
+                    ->defaultValue('"')
+                ->end()
+                ->scalarNode('csv_escape_char')
+                    ->defaultValue('')
+                ->end()
+                ->scalarNode('csv_end_of_line')
+                    ->defaultValue("\n")
+                ->end()
+                ->scalarNode('csv_key_separator')
+                    ->defaultValue('.')
+                ->end()
+                ->booleanNode('output_utf8_bom')
+                    ->defaultFalse()
+                ->end()
+            ->end();
+
+        return $node;
+    }
 }

lib/RoadizRozierBundle/src/DependencyInjection/RoadizRozierExtension.php

@@ -33,6 +33,11 @@ public function load(array $configs, ContainerBuilder $container): void
             $projectDir.DIRECTORY_SEPARATOR.trim($config['theme_dir'], "/ \t\n\r\0\x0B")
         );
 
+        $container->setParameter(
+            'roadiz_rozier.csv_encoder_options',
+            $config['csv_encoder_options'],
+        );
+
         $loader = new YamlFileLoader($container, new FileLocator(dirname(__DIR__).'/../config'));
         $loader->load('services.yaml');
 

lib/Rozier/src/Controllers/CustomForms/CustomFormsUtilsController.php

@@ -23,6 +23,7 @@ public function __construct(
         private readonly TranslatorInterface $translator,
         private readonly CustomFormAnswerSerializer $customFormAnswerSerializer,
         private readonly SerializerInterface $serializer,
+        private readonly array $csvEncoderOptions,
     ) {
     }
 
@@ -54,6 +55,7 @@ public function exportAction(Request $request, int $id): Response
 
         $response = new StreamedResponse(function () use ($answersArray, $keys) {
             echo $this->serializer->serialize($answersArray, 'csv', [
+                ...$this->csvEncoderOptions,
                 'csv_headers' => $keys,
             ]);
         });

lib/Rozier/src/Controllers/Nodes/ExportController.php

@@ -20,6 +20,7 @@ class ExportController extends RozierApp
     public function __construct(
         private readonly ManagerRegistry $managerRegistry,
         private readonly SerializerInterface $serializer,
+        private readonly array $csvEncoderOptions,
     ) {
     }
 
@@ -64,6 +65,7 @@ public function exportAllAction(int $translationId, ?int $parentNodeId = null):
 
         $response = new StreamedResponse(function () use ($sources) {
             echo $this->serializer->serialize($sources, 'csv', [
+                ...$this->csvEncoderOptions,
                 'groups' => [
                     'nodes_sources',
                     'urls',

lib/Rozier/src/Controllers/SearchController.php

@@ -48,6 +48,7 @@ public function __construct(
         protected readonly ManagerRegistry $managerRegistry,
         protected readonly FormFactoryInterface $formFactory,
         protected readonly SerializerInterface $serializer,
+        protected readonly array $csvEncoderOptions,
     ) {
     }
 
@@ -376,6 +377,7 @@ protected function handleNodeForm(FormInterface $form, NodeType $nodetype): ?Res
             $filename = 'search-'.$nodetype->getName().'-'.date('YmdHis').'.csv';
             $response = new StreamedResponse(function () use ($entities) {
                 echo $this->serializer->serialize($entities, 'csv', [
+                    ...$this->csvEncoderOptions,
                     'groups' => [
                         'nodes_sources',
                         'urls',