Merge 2.x into 3.x

.github/workflows/documentation.yaml

@@ -5,6 +5,8 @@
 name: Documentation
 
 on:
+    schedule:
+        - cron: '30 0 * * *'
     push:
         branches:
             - 2.x

.github/workflows/lint.yaml

@@ -5,6 +5,8 @@
 name: Lint
 
 on:
+    schedule:
+        - cron: '30 0 * * *'
     push:
         branches:
             - 2.x

.github/workflows/qa.yaml

@@ -5,6 +5,8 @@
 name: Quality assurance
 
 on:
+    schedule:
+        - cron: '30 0 * * *'
     push:
         branches:
             - 2.x

.github/workflows/test.yaml

@@ -5,6 +5,8 @@
 name: Test
 
 on:
+    schedule:
+        - cron: '30 0 * * *'
     push:
         branches:
             - 2.x

Makefile

@@ -98,5 +98,5 @@ phpstan:
 .PHONY: phpstan
 
 psalm:
-	vendor/bin/psalm
+	vendor/bin/psalm --php-version=8.1
 .PHONY: psalm

src/Bridge/Symfony/DependencyInjection/SonataExporterExtension.php

@@ -16,7 +16,7 @@
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
@@ -30,8 +30,8 @@ public function load(array $configs, ContainerBuilder $container): void
         $configuration = new Configuration();
         $config = $processor->processConfiguration($configuration, $configs);
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('services.xml');
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader->load('services.php');
 
         $this->configureExporter($container, $config['exporter']);
         $this->configureWriters($container, $config['writers']);

src/Bridge/Symfony/Resources/config/services.php

@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Sonata\Exporter\Exporter;
+use Sonata\Exporter\Writer\CsvWriter;
+use Sonata\Exporter\Writer\JsonWriter;
+use Sonata\Exporter\Writer\XlsWriter;
+use Sonata\Exporter\Writer\XmlWriter;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    // Use "param" function for creating references to parameters when dropping support for Symfony 5.1
+    $services = $containerConfigurator->services();
+
+    $services->set('sonata.exporter.writer.csv', CsvWriter::class)
+        ->args([
+            '%sonata.exporter.writer.csv.filename%',
+            '%sonata.exporter.writer.csv.delimiter%',
+            '%sonata.exporter.writer.csv.enclosure%',
+            '%sonata.exporter.writer.csv.escape%',
+            '%sonata.exporter.writer.csv.show_headers%',
+            '%sonata.exporter.writer.csv.with_bom%',
+        ]);
+
+    $services->set('sonata.exporter.writer.json', JsonWriter::class)
+        ->args([
+            '%sonata.exporter.writer.json.filename%',
+        ]);
+
+    $services->set('sonata.exporter.writer.xls', XlsWriter::class)
+        ->args([
+            '%sonata.exporter.writer.xls.filename%',
+            '%sonata.exporter.writer.xls.show_headers%',
+        ]);
+
+    $services->set('sonata.exporter.writer.xml', XmlWriter::class)
+        ->args([
+            '%sonata.exporter.writer.xml.filename%',
+            '%sonata.exporter.writer.xml.main_element%',
+            '%sonata.exporter.writer.xml.child_element%',
+        ]);
+
+    $services->set('sonata.exporter.exporter', Exporter::class)
+        ->public();
+
+    $services->alias(Exporter::class, 'sonata.exporter.exporter');
+};