Allow Symfony 8, rework service config to PHP

DependencyInjection/AdmingeneratorGeneratorExtension.php

@@ -9,9 +9,9 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\Yaml\Yaml;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
 
@@ -35,8 +35,8 @@ public function prepend(ContainerBuilder $container): void
 
     public function load(array $configs, ContainerBuilder $container): void
     {
-        $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');
 
         $config = $this->processConfiguration($this->getConfiguration($configs, $container), $configs);
 
@@ -107,11 +107,11 @@ private function processModelManagerConfiguration(array $config, ContainerBuilde
             throw new ModelManagerNotSelectedException();
         }
 
-        $loader = new XmlFileLoader($container, new FileLocator(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'Resources' . DIRECTORY_SEPARATOR . 'config'));
+        $loader = new PhpFileLoader($container, new FileLocator(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'Resources' . DIRECTORY_SEPARATOR . 'config'));
         $config['templates_dirs'][] = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'Resources' . DIRECTORY_SEPARATOR . 'views' . DIRECTORY_SEPARATOR . 'templates';
 
         if ($config['use_doctrine_orm']) {
-            $loader->load('doctrine_orm.xml');
+            $loader->load('doctrine_orm.php');
             $this->addTemplatesInitialization($container->getDefinition('admingenerator.generator.doctrine'), $config['templates_dirs']);
             if ($config['overwrite_if_exists']) {
                 $container
@@ -127,7 +127,7 @@ private function processModelManagerConfiguration(array $config, ContainerBuilde
         }
 
         if ($config['use_doctrine_odm']) {
-            $loader->load('doctrine_odm.xml');
+            $loader->load('doctrine_odm.php');
             $this->addTemplatesInitialization($container->getDefinition('admingenerator.generator.doctrine_odm'), $config['templates_dirs']);
             if ($config['overwrite_if_exists']) {
                 $container
@@ -143,7 +143,7 @@ private function processModelManagerConfiguration(array $config, ContainerBuilde
         }
 
         if ($config['use_propel']) {
-            $loader->load('propel.xml');
+            $loader->load('propel.php');
             $this->addTemplatesInitialization($container->getDefinition('admingenerator.generator.propel'), $config['templates_dirs']);
             if ($config['overwrite_if_exists']) {
                 $container

Resources/config/doctrine_odm.php

@@ -0,0 +1,29 @@
+<?php
+
+use Admingenerator\GeneratorBundle\Generator\DoctrineODMGenerator;
+use Admingenerator\GeneratorBundle\Guesser\DoctrineODMFieldGuesser;
+use Admingenerator\GeneratorBundle\QueryFilter\DoctrineODMQueryFilter;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
+return static function (ContainerConfigurator $container): void {
+    $container->parameters()
+        ->set('admingenerator.doctrine_odm.class', DoctrineODMGenerator::class)
+        ->set('admingenerator.fieldguesser.doctrine_odm.class', DoctrineODMFieldGuesser::class)
+        ->set('admingenerator.queryfilter.doctrine_odm.class', DoctrineODMQueryFilter::class);
+
+    $services = $container->services();
+    $services->set('admingenerator.fieldguesser.doctrine_odm', param('admingenerator.fieldguesser.doctrine_odm.class'))
+        ->arg('$registry', service('doctrine'))
+        ->arg('$objectModel', 'document');
+
+    $services->set('admingenerator.generator.doctrine_odm', param('admingenerator.doctrine_odm.class'))
+        ->arg('$outputDir', param('kernel.cache_dir'))
+        ->call('setBundleConfig', [param('admingenerator')])
+        ->call('setFieldGuesser', [service('admingenerator.fieldguesser.doctrine_odm')])
+        ->call('setRouter', [service('router')])
+        ->call('setTwig', [service('twig')])
+        ->call('setKernel', [service('kernel')])
+        ->public();
+};

Resources/config/doctrine_orm.php

@@ -0,0 +1,29 @@
+<?php
+
+use Admingenerator\GeneratorBundle\Generator\DoctrineGenerator;
+use Admingenerator\GeneratorBundle\Guesser\DoctrineFieldGuesser;
+use Admingenerator\GeneratorBundle\QueryFilter\DoctrineQueryFilter;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
+return static function (ContainerConfigurator $container): void {
+    $container->parameters()
+        ->set('admingenerator.doctrine.class', DoctrineGenerator::class)
+        ->set('admingenerator.fieldguesser.doctrine.class', DoctrineFieldGuesser::class)
+        ->set('admingenerator.queryfilter.doctrine.class', DoctrineQueryFilter::class);
+
+    $services = $container->services();
+    $services->set('admingenerator.fieldguesser.doctrine', param('admingenerator.fieldguesser.doctrine.class'))
+        ->arg('$registry', service('doctrine'))
+        ->arg('$objectModel', 'entity');
+
+    $services->set('admingenerator.generator.doctrine', param('admingenerator.doctrine.class'))
+        ->arg('$outputDir', param('kernel.cache_dir'))
+        ->call('setBundleConfig', [param('admingenerator')])
+        ->call('setFieldGuesser', [service('admingenerator.fieldguesser.doctrine')])
+        ->call('setRouter', [service('router')])
+        ->call('setTwig', [service('twig')])
+        ->call('setKernel', [service('kernel')])
+        ->public();
+};

Resources/config/propel.php

@@ -0,0 +1,27 @@
+<?php
+
+use Admingenerator\GeneratorBundle\Generator\PropelGenerator;
+use Admingenerator\GeneratorBundle\Guesser\PropelORMFieldGuesser;
+use Admingenerator\GeneratorBundle\QueryFilter\PropelQueryFilter;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
+return static function (ContainerConfigurator $container): void {
+    $container->parameters()
+        ->set('admingenerator.propel.class', PropelGenerator::class)
+        ->set('admingenerator.fieldguesser.propel.class', PropelORMFieldGuesser::class)
+        ->set('admingenerator.queryfilter.propel.class', PropelQueryFilter::class);
+
+    $services = $container->services();
+    $services->set('admingenerator.fieldguesser.propel', param('admingenerator.fieldguesser.propel.class'));
+
+    $services->set('admingenerator.generator.propel', param('admingenerator.propel.class'))
+        ->arg('$outputDir', param('kernel.cache_dir'))
+        ->call('setBundleConfig', [param('admingenerator')])
+        ->call('setFieldGuesser', [service('admingenerator.fieldguesser.propel')])
+        ->call('setRouter', [service('router')])
+        ->call('setTwig', [service('twig')])
+        ->call('setKernel', [service('kernel')])
+        ->public();
+};

Resources/config/services.php

@@ -0,0 +1,101 @@
+<?php
+
+use Admingenerator\GeneratorBundle\CacheBuilder\GeneratorCacheBuilder;
+use Admingenerator\GeneratorBundle\CacheWarmer\GeneratorCacheWarmer;
+use Admingenerator\GeneratorBundle\Command\AssetsInstallCommand;
+use Admingenerator\GeneratorBundle\Command\GenerateBaseClassesCommand;
+use Admingenerator\GeneratorBundle\EventListener\ControllerListener;
+use Admingenerator\GeneratorBundle\Maker\MakeAdmin;
+use Admingenerator\GeneratorBundle\Pagerfanta\View\AdmingeneratorView;
+use Admingenerator\GeneratorBundle\Routing\NestedRoutingLoader;
+use Admingenerator\GeneratorBundle\Routing\RoutingLoader;
+use Admingenerator\GeneratorBundle\Twig\Extension\ArrayExtension;
+use Admingenerator\GeneratorBundle\Twig\Extension\ClassifyExtension;
+use Admingenerator\GeneratorBundle\Twig\Extension\ConfigExtension;
+use Admingenerator\GeneratorBundle\Twig\Extension\CsrfTokenExtension;
+use Admingenerator\GeneratorBundle\Twig\Extension\EchoExtension;
+use Admingenerator\GeneratorBundle\Twig\Extension\ExtendsAdmingeneratedExtension;
+use Admingenerator\GeneratorBundle\Twig\Extension\LocalizedMoneyExtension;
+use Admingenerator\GeneratorBundle\Twig\Extension\SecurityExtension;
+use Admingenerator\GeneratorBundle\Validator\ModelClassValidator;
+use Admingenerator\GeneratorBundle\Validator\PropelModelClassValidator;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use TwigGenerator\Extension\ExtraFilterExtension;
+use TwigGenerator\Extension\PHPPrintExtension;
+use TwigGenerator\Extension\TwigPrintExtension;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
+return static function (ContainerConfigurator $container): void {
+    $container->parameters()
+        ->set('routing.loader.admingenerator.class', RoutingLoader::class)
+        ->set('routing.loader.admingenerator_nested.class', NestedRoutingLoader::class)
+        ->set('admingenerator.generator_cache_builder', GeneratorCacheBuilder::class)
+        ->set('admingenerator.cache_warmer.class', GeneratorCacheWarmer::class)
+        ->set('form.type_guesser.admingenerator.class', ValidatorTypeGuesser::class)
+        ->set('admingenerator.pagination.class', AdmingeneratorView::class)
+        ->set('admingenerator.base_admin_template', '@AdmingeneratorGenerator/base.html.twig')
+        ->set('admingenerator.overwrite_if_exists', false)
+        ->set('admingenerator.validator.model_class.class', ModelClassValidator::class)
+        ->set('admingenerator.validator.propel_model_class.class', PropelModelClassValidator::class);
+
+    $services = $container->services();
+    $configureTwigExtension = static fn(string $id, string $class) => $services->set($id, $class)->tag('twig.extension');
+    $configureTwigExtension('twig.extension.admingenerator.array', ArrayExtension::class);
+    $configureTwigExtension('twig.extension.admingenerator.classify', ClassifyExtension::class);
+    $configureTwigExtension('twig.extension.admingenerator.echo', EchoExtension::class);
+    $configureTwigExtension('twig.extension.admingenerator.extra_filter', ExtraFilterExtension::class);
+    $configureTwigExtension('twig.extension.admingenerator.twig_print', TwigPrintExtension::class);
+    $configureTwigExtension('twig.extension.admingenerator.php_print', PHPPrintExtension::class);
+    $configureTwigExtension('twig.extension.admingenerator.config', ConfigExtension::class)
+        ->arg('$bundleConfig', param('admingenerator'));
+    $configureTwigExtension('twig.extension.admingenerator.csrf', CsrfTokenExtension::class)
+        ->arg('$csrfTokenManager', service('security.csrf.token_manager'));
+    $configureTwigExtension('twig.extension.admingenerator.localized_money', LocalizedMoneyExtension::class);
+    $configureTwigExtension('twig.extension.admingenerator.extends', ExtendsAdmingeneratedExtension::class);
+    $configureTwigExtension('twig.extension.admingenerator.security', SecurityExtension::class)
+        ->arg('$authorizationChecker', AuthorizationCheckerInterface::class);
+
+    $services->set('admingenerator.generator.listener', ControllerListener::class)
+        ->tag('kernel.event_listener', ['event' => 'kernel.request', 'method' => 'onKernelRequest'])
+        ->arg('$container', service('service_container'))
+        ->arg('$twig', service('twig'));
+
+    $services->set('routing.loader.admingenerator', param('routing.loader.admingenerator.class'))
+        ->tag('routing.loader')
+        ->arg('$locator', service('file_locator'));
+
+    $services->set('routing.loader.admingenerator_nested', param('routing.loader.admingenerator_nested.class'))
+        ->tag('routing.loader')
+        ->arg('$locator', service('file_locator'));
+
+    $services->set('pagerfanta.view.admingenerator', param('admingenerator.pagination.class'))
+        ->tag('pagerfanta.view', ['alias' => 'admingenerator'])
+        ->arg('$translator', service('translator'));
+
+    $services->set('admingenerator.maker.make_admin', MakeAdmin::class)
+        ->tag('maker.command')
+        ->tag('container.no_preload');
+    $services->set('admingenerator.command.install-assets', AssetsInstallCommand::class)
+        ->tag('console.command', ['command' => 'admin:install-assets'])
+        ->arg('$projectDir', param('kernel.project_dir'));
+
+    $services->set('admingenerator.validator.model_class', param('admingenerator.validator.model_class.class'))
+        ->tag('admingenerator.validator', ['alias' => 'model_class']);
+
+    $services->set('admingenerator.validator.propel_model_class', param('admingenerator.validator.propel_model_class.class'))
+        ->tag('admingenerator.validator.propel', ['alias' => 'propel_model_class']);
+
+    $services->set('admingenerator.generator_cache_builder', param('admingenerator.generator_cache_builder'))
+        ->arg('$container', service('service_container'));
+
+    $services->set('admingenerator.cache_warmer', param('admingenerator.cache_warmer.class'))
+        ->tag('kernel.cache_warmer', ['priority' => 100])
+        ->arg('$generatorCacheBuilder', service('admingenerator.generator_cache_builder'));
+
+    $services->set('admingenerator.command.generate_base_classes', GenerateBaseClassesCommand::class)
+        ->tag('console.command', ['command' => 'admin:generate-base-classes'])
+        ->arg('$generatorCacheBuilder', service('admingenerator.generator_cache_builder'));
+};