Symfony 8 compatibility: convert XML DI config to PHP

composer.json

@@ -37,12 +37,12 @@
         "phpunit/phpunit": "^9.5",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
         "sylius-labs/coding-standard": "^4.2",
-        "symfony/browser-kit": "^6.4 || ^7.1",
-        "symfony/debug-bundle": "^6.4 || ^7.1",
-        "symfony/dotenv": "^6.4 || ^7.1",
+        "symfony/browser-kit": "^6.4 || ^7.1 || ^8.0",
+        "symfony/debug-bundle": "^6.4 || ^7.1 || ^8.0",
+        "symfony/dotenv": "^6.4 || ^7.1 || ^8.0",
         "symfony/flex": "^2.2.2",
-        "symfony/intl": "^6.4 || ^7.1",
-        "symfony/web-profiler-bundle": "^6.4 || ^7.1",
+        "symfony/intl": "^6.4 || ^7.1 || ^8.0",
+        "symfony/web-profiler-bundle": "^6.4 || ^7.1 || ^8.0",
         "vimeo/psalm": "6.10.3"
     },
     "conflict": {
@@ -58,7 +58,7 @@
     },
     "extra": {
         "symfony": {
-            "require": "^5.4 || ^6.0",
+            "require": "^6.4 || ^7.4 || ^8.0",
             "allow-contrib": true
         }
     },

src/DependencyInjection/GallySyliusExtension.php

@@ -19,7 +19,7 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 
 final class GallySyliusExtension extends AbstractResourceExtension implements PrependExtensionInterface
 {
@@ -29,9 +29,9 @@ final class GallySyliusExtension extends AbstractResourceExtension implements Pr
     public function load(array $configs, ContainerBuilder $container): void
     {
         $config = $this->processConfiguration($this->getConfiguration([], $container), $configs);
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
 
-        $loader->load('services.xml');
+        $loader->load('services.php');
 
         /** @var string $driver */
         $driver = $config['driver'];

src/Resources/config/services.php

@@ -0,0 +1,93 @@
+<?php
+/**
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Gally to newer versions in the future.
+ *
+ * @package   Gally
+ * @author    Stephan Hochdörfer <S.Hochdoerfer@bitexpert.de>, Gally Team <elasticsuite@smile.fr>
+ * @copyright 2022-present Smile
+ * @license   Open Software License v. 3.0 (OSL-3.0)
+ */
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Doctrine\ORM\Mapping\ClassMetadata;
+use Gally\Sdk\Service\SearchManager;
+use Gally\Sdk\Service\StructureSynchonizer;
+use Gally\SyliusPlugin\Config\ConfigManager;
+use Gally\SyliusPlugin\Controller\Admin\GallyController;
+use Gally\SyliusPlugin\Controller\Shop\FilterController;
+use Gally\SyliusPlugin\Controller\Shop\SearchController;
+use Gally\SyliusPlugin\Entity\GallyConfiguration;
+use Gally\SyliusPlugin\Form\Extension\ChannelTypeExtension;
+use Gally\SyliusPlugin\Indexer\Provider\CatalogProvider;
+use Gally\SyliusPlugin\Listener\AdminMenuListener;
+use Gally\SyliusPlugin\Repository\GallyConfigurationRepository;
+use Gally\SyliusPlugin\Search\FilterConverter;
+use Gally\SyliusPlugin\Search\Finder;
+use Gally\SyliusPlugin\Service\CacheManager;
+
+return static function (ContainerConfigurator $container) {
+    $container->import('services/sdk.php');
+    $container->import('services/commands.php');
+    $container->import('services/indexers.php');
+    $container->import('services/search.php');
+    $container->import('services/twig.php');
+    $container->import('services/twig/component/product.php');
+    $container->import('services/tracking.php');
+
+    $container->parameters()
+        ->set('gally.model.configuration', GallyConfiguration::class);
+
+    $services = $container->services();
+
+    $services->set(GallyConfigurationRepository::class)
+        ->args([
+            service('doctrine.orm.entity_manager'),
+            inline_service(ClassMetadata::class)
+                ->factory([service('doctrine.orm.entity_manager'), 'getClassMetadata'])
+                ->args(['%gally.model.configuration%']),
+        ]);
+
+    $services->set(GallyController::class)
+        ->args([
+            service(GallyConfigurationRepository::class),
+            service(StructureSynchonizer::class),
+            service(ConfigManager::class),
+            tagged_iterator('gally.dataprovider', 'entity'),
+            service('translator'),
+            service(CacheManager::class),
+        ])
+        ->call('setContainer', [service('service_container')])
+        ->tag('controller.service_arguments');
+
+    $services->set(FilterController::class)
+        ->args([
+            service(CatalogProvider::class),
+            service(SearchManager::class),
+            service('sylius.context.channel'),
+            service('sylius.context.locale'),
+            service('sylius.repository.taxon'),
+            service('form.factory'),
+            service(FilterConverter::class),
+        ])
+        ->call('setContainer', [service('service_container')])
+        ->tag('controller.service_arguments');
+
+    $services->set(SearchController::class)
+        ->args([service(Finder::class), service('sylius.context.channel'), service('sylius.context.locale')])
+        ->call('setContainer', [service('service_container')])
+        ->tag('controller.service_arguments');
+
+    $services->set(ChannelTypeExtension::class)
+        ->tag('form.type_extension');
+
+    $services->set('gally.listener.admin.menu_builder', AdminMenuListener::class)
+        ->tag('kernel.event_listener', ['event' => 'sylius.menu.admin.main', 'method' => 'addAdminMenuItems']);
+
+    $services->set(ConfigManager::class)
+        ->args([service(GallyConfigurationRepository::class), service('sylius.context.channel')]);
+};

src/Resources/config/services/commands.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Gally to newer versions in the future.
+ *
+ * @package   Gally
+ * @author    Stephan Hochdörfer <S.Hochdoerfer@bitexpert.de>, Gally Team <elasticsuite@smile.fr>
+ * @copyright 2022-present Smile
+ * @license   Open Software License v. 3.0 (OSL-3.0)
+ */
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Gally\Sdk\Service\StructureSynchonizer;
+use Gally\SyliusPlugin\Command\Index;
+use Gally\SyliusPlugin\Command\StructureClean;
+use Gally\SyliusPlugin\Command\StructureSync;
+
+return static function (ContainerConfigurator $container) {
+    $services = $container->services();
+
+    $services->set(StructureSync::class)
+        ->args([service(StructureSynchonizer::class), tagged_iterator('gally.dataprovider', 'entity')])
+        ->tag('console.command');
+
+    $services->set(StructureClean::class)
+        ->args([service(StructureSynchonizer::class), tagged_iterator('gally.dataprovider', 'entity')])
+        ->tag('console.command');
+
+    $services->set(Index::class)
+        ->args([tagged_iterator('gally.entity.indexer')])
+        ->tag('console.command');
+};

src/Resources/config/services/indexers.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Gally to newer versions in the future.
+ *
+ * @package   Gally
+ * @author    Stephan Hochdörfer <S.Hochdoerfer@bitexpert.de>, Gally Team <elasticsuite@smile.fr>
+ * @copyright 2022-present Smile
+ * @license   Open Software License v. 3.0 (OSL-3.0)
+ */
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Gally\Sdk\Repository\LocalizedCatalogRepository;
+use Gally\Sdk\Service\IndexOperation;
+use Gally\Sdk\Service\StructureSynchonizer;
+use Gally\SyliusPlugin\Config\ConfigManager;
+use Gally\SyliusPlugin\Indexer\AbstractIndexer;
+use Gally\SyliusPlugin\Indexer\CategoryIndexer;
+use Gally\SyliusPlugin\Indexer\ProductIndexer;
+use Gally\SyliusPlugin\Indexer\Provider\CatalogProvider;
+use Gally\SyliusPlugin\Indexer\Provider\SourceFieldOptionProvider;
+use Gally\SyliusPlugin\Indexer\Provider\SourceFieldProvider;
+use Gally\SyliusPlugin\Indexer\Subscriber\CategorySubscriber;
+use Gally\SyliusPlugin\Indexer\Subscriber\ChannelSubscriber;
+use Gally\SyliusPlugin\Indexer\Subscriber\ProductAttributeSubscriber;
+use Gally\SyliusPlugin\Indexer\Subscriber\ProductSubscriber;
+
+return static function (ContainerConfigurator $container) {
+    $services = $container->services();
+
+    $services->set(CatalogProvider::class)
+        ->args([service('sylius.repository.channel'), service('sylius.context.channel'), service('sylius.context.locale')])
+        ->tag('gally.dataprovider', ['entity' => 'catalog']);
+
+    $services->set(SourceFieldProvider::class)
+        ->args([service(CatalogProvider::class), service('sylius.repository.product_attribute'), service('sylius.repository.product_option')])
+        ->tag('gally.dataprovider', ['entity' => 'sourceField']);
+
+    $services->set(SourceFieldOptionProvider::class)
+        ->args([service(CatalogProvider::class), service('sylius.repository.product_attribute'), service('sylius.repository.product_option')])
+        ->tag('gally.dataprovider', ['entity' => 'sourceFieldOption']);
+
+    $services->set(ChannelSubscriber::class)
+        ->args([service(CatalogProvider::class), service(StructureSynchonizer::class), service(ConfigManager::class)])
+        ->tag('kernel.event_subscriber');
+
+    $services->set(ProductAttributeSubscriber::class)
+        ->args([
+            service(LocalizedCatalogRepository::class),
+            service(SourceFieldProvider::class),
+            service(SourceFieldOptionProvider::class),
+            service(StructureSynchonizer::class),
+        ])
+        ->tag('kernel.event_subscriber');
+
+    $services->set(AbstractIndexer::class)
+        ->abstract()
+        ->args([service('sylius.repository.channel'), service(CatalogProvider::class), service(IndexOperation::class)]);
+
+    $services->set(CategoryIndexer::class)
+        ->parent(AbstractIndexer::class)
+        ->args([service('sylius.repository.taxon')])
+        ->tag('gally.entity.indexer', ['priority' => 50]);
+
+    $services->set(ProductIndexer::class)
+        ->parent(AbstractIndexer::class)
+        ->args([service('sylius.repository.product'), service('sylius.calculator.product_variant_price')])
+        ->tag('gally.entity.indexer', ['priority' => 50]);
+
+    $services->set(CategorySubscriber::class)
+        ->args([service(CategoryIndexer::class)])
+        ->tag('kernel.event_subscriber');
+
+    $services->set(ProductSubscriber::class)
+        ->args([service(ProductIndexer::class)])
+        ->tag('kernel.event_subscriber');
+};