Move configuration to PHP

peter-gribanov · Sep 3, 2020 · 3ad3910 · 3ad3910
1 parent d54497d
commit 3ad3910
Show file tree

Hide file tree

Showing 31 changed files with 1,043 additions and 493 deletions.
diff --git a/composer.json b/composer.json
@@ -37,7 +37,7 @@
         "symfony/asset": "^4.4 || ^5.1",
         "symfony/config": "^4.4",
         "symfony/console": "^4.4",
-        "symfony/dependency-injection": "^4.4.3",
+        "symfony/dependency-injection": "^4.4.8",
         "symfony/doctrine-bridge": "^4.4",
         "symfony/event-dispatcher": "^4.4",
         "symfony/event-dispatcher-contracts": "^1.1 || ^2.0",

diff --git a/src/DependencyInjection/SonataAdminExtension.php b/src/DependencyInjection/SonataAdminExtension.php
@@ -18,7 +18,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;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType as SymfonyChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\DateTimeType as SymfonyDateTimeType;
@@ -59,24 +59,24 @@ public function load(array $configs, ContainerBuilder $container)
             ]);
         }
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('actions.xml');
-        $loader->load('block.xml');
-        $loader->load('commands.xml');
-        $loader->load('core.xml');
-        $loader->load('event_listener.xml');
-        $loader->load('form_types.xml');
-        $loader->load('menu.xml');
-        $loader->load('route.xml');
-        $loader->load('twig.xml');
-        $loader->load('validator.xml');
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader->load('actions.php');
+        $loader->load('block.php');
+        $loader->load('commands.php');
+        $loader->load('core.php');
+        $loader->load('event_listener.php');
+        $loader->load('form_types.php');
+        $loader->load('menu.php');
+        $loader->load('route.php');
+        $loader->load('twig.php');
+        $loader->load('validator.php');
 
         if (isset($bundles['MakerBundle'])) {
-            $loader->load('makers.xml');
+            $loader->load('makers.php');
         }
 
         if (isset($bundles['SonataExporterBundle'])) {
-            $loader->load('exporter.xml');
+            $loader->load('exporter.php');
         }
 
         $configuration = $this->getConfiguration($configs, $container);
@@ -157,7 +157,7 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('sonata.admin.configuration.security.admin_permissions', $config['security']['admin_permissions']);
         $container->setParameter('sonata.admin.configuration.security.object_permissions', $config['security']['object_permissions']);
 
-        $loader->load('security.xml');
+        $loader->load('security.php');
 
         $container->setParameter('sonata.admin.extension.map', $config['extensions']);
 
@@ -272,10 +272,10 @@ private function replacePropertyAccessor(ContainerBuilder $container): void
     /**
      * NEXT_MAJOR: remove this method.
      */
-    private function configureTwigTextExtension(ContainerBuilder $container, XmlFileLoader $loader, array $config): void
+    private function configureTwigTextExtension(ContainerBuilder $container, PhpFileLoader $loader, array $config): void
     {
         $container->setParameter('sonata.admin.configuration.legacy_twig_text_extension', $config['options']['legacy_twig_text_extension']);
-        $loader->load('twig_string.xml');
+        $loader->load('twig_string.php');
 
         if (false !== $config['options']['legacy_twig_text_extension']) {
             $container

diff --git a/src/Export/Exporter.php b/src/Export/Exporter.php
@@ -36,6 +36,6 @@ public function __construct()
 } else {
     class_alias(
         BaseExporter::class,
-        __NAMESPACE__.'\Exporter'
+        'Sonata\AdminBundle\Export\Exporter'
     );
 }
diff --git a/src/Resources/config/actions.php b/src/Resources/config/actions.php
@@ -0,0 +1,86 @@
+<?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\AdminBundle\Action\AppendFormFieldElementAction;
+use Sonata\AdminBundle\Action\DashboardAction;
+use Sonata\AdminBundle\Action\GetShortObjectDescriptionAction;
+use Sonata\AdminBundle\Action\RetrieveAutocompleteItemsAction;
+use Sonata\AdminBundle\Action\RetrieveFormFieldElementAction;
+use Sonata\AdminBundle\Action\SearchAction;
+use Sonata\AdminBundle\Action\SetObjectFieldValueAction;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ReferenceConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    // Use "service" function for creating references to services when dropping support for Symfony 4.4
+    // Use "param" function for creating references to parameters when dropping support for Symfony 5.1
+    $containerConfigurator->services()
+
+        ->set(DashboardAction::class, DashboardAction::class)
+            ->public()
+            ->args([
+                '%sonata.admin.configuration.dashboard_blocks%',
+                new ReferenceConfigurator('sonata.admin.breadcrumbs_builder'),
+                new ReferenceConfigurator('sonata.admin.global_template_registry'),
+                new ReferenceConfigurator('sonata.admin.pool'),
+                new ReferenceConfigurator('twig'),
+            ])
+
+        ->set(SearchAction::class, SearchAction::class)
+            ->public()
+            ->args([
+                new ReferenceConfigurator('sonata.admin.pool'),
+                new ReferenceConfigurator('sonata.admin.search.handler'),
+                new ReferenceConfigurator('sonata.admin.global_template_registry'),
+                new ReferenceConfigurator('sonata.admin.breadcrumbs_builder'),
+                new ReferenceConfigurator('twig'),
+            ])
+
+        ->set('sonata.admin.action.append_form_field_element', AppendFormFieldElementAction::class)
+            ->public()
+            ->args([
+                new ReferenceConfigurator('twig'),
+                new ReferenceConfigurator('sonata.admin.pool'),
+                new ReferenceConfigurator('sonata.admin.helper'),
+            ])
+
+        ->set('sonata.admin.action.retrieve_form_field_element', RetrieveFormFieldElementAction::class)
+            ->public()
+            ->args([
+                new ReferenceConfigurator('twig'),
+                new ReferenceConfigurator('sonata.admin.pool'),
+                new ReferenceConfigurator('sonata.admin.helper'),
+            ])
+
+        ->set('sonata.admin.action.get_short_object_description', GetShortObjectDescriptionAction::class)
+            ->public()
+            ->args([
+                new ReferenceConfigurator('twig'),
+                new ReferenceConfigurator('sonata.admin.pool'),
+            ])
+
+        ->set('sonata.admin.action.set_object_field_value', SetObjectFieldValueAction::class)
+            ->public()
+            ->args([
+                new ReferenceConfigurator('twig'),
+                new ReferenceConfigurator('sonata.admin.pool'),
+                new ReferenceConfigurator('validator'),
+            ])
+
+        ->set('sonata.admin.action.retrieve_autocomplete_items', RetrieveAutocompleteItemsAction::class)
+            ->public()
+            ->args([
+                new ReferenceConfigurator('sonata.admin.pool'),
+            ])
+    ;
+};
diff --git a/src/Resources/config/actions.xml b/src/Resources/config/actions.xml
diff --git a/src/Resources/config/block.php b/src/Resources/config/block.php
@@ -0,0 +1,51 @@
+<?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\AdminBundle\Block\AdminListBlockService;
+use Sonata\AdminBundle\Block\AdminSearchBlockService;
+use Sonata\AdminBundle\Block\AdminStatsBlockService;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ReferenceConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    // Use "service" function for creating references to services when dropping support for Symfony 4.4
+    // Use "param" function for creating references to parameters when dropping support for Symfony 5.1
+    $containerConfigurator->services()
+
+        ->set('sonata.admin.block.admin_list', AdminListBlockService::class)
+            ->public()
+            ->tag('sonata.block')
+            ->args([
+                new ReferenceConfigurator('twig'),
+                new ReferenceConfigurator('sonata.admin.pool'),
+                new ReferenceConfigurator('sonata.admin.global_template_registry'),
+            ])
+
+        ->set('sonata.admin.block.search_result', AdminSearchBlockService::class)
+            ->public()
+            ->tag('sonata.block')
+            ->args([
+                new ReferenceConfigurator('twig'),
+                new ReferenceConfigurator('sonata.admin.pool'),
+                new ReferenceConfigurator('sonata.admin.search.handler'),
+            ])
+
+        ->set('sonata.admin.block.stats', AdminStatsBlockService::class)
+            ->public()
+            ->tag('sonata.block')
+            ->args([
+                new ReferenceConfigurator('twig'),
+                new ReferenceConfigurator('sonata.admin.pool'),
+            ])
+    ;
+};
diff --git a/src/Resources/config/block.xml b/src/Resources/config/block.xml
diff --git a/src/Resources/config/commands.php b/src/Resources/config/commands.php
@@ -0,0 +1,71 @@
+<?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\AdminBundle\Command\CreateClassCacheCommand;
+use Sonata\AdminBundle\Command\ExplainAdminCommand;
+use Sonata\AdminBundle\Command\GenerateObjectAclCommand;
+use Sonata\AdminBundle\Command\ListAdminCommand;
+use Sonata\AdminBundle\Command\SetupAclCommand;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ReferenceConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    // Use "service" function for creating references to services when dropping support for Symfony 4.4
+    // Use "param" function for creating references to parameters when dropping support for Symfony 5.1
+    $containerConfigurator->services()
+
+        // NEXT_MAJOR: Remove this service.
+        ->set(CreateClassCacheCommand::class, CreateClassCacheCommand::class)
+            ->public()
+            ->tag('console.command', [
+                'command' => 'cache:create-cache-class',
+            ])
+            ->deprecate('The "%service_id%" service is deprecated since sonata-project/admin-bundle 3.39.0 and will be removed in 4.0.')
+            ->args([
+                '%kernel.cache_dir%',
+                '%kernel.debug%',
+            ])
+
+        ->set(ExplainAdminCommand::class, ExplainAdminCommand::class)
+            ->public()
+            ->tag('console.command')
+            ->args([
+                new ReferenceConfigurator('sonata.admin.pool'),
+                new ReferenceConfigurator('validator'),
+            ])
+
+        ->set(GenerateObjectAclCommand::class, GenerateObjectAclCommand::class)
+            ->public()
+            ->tag('console.command')
+            ->args([
+                new ReferenceConfigurator('sonata.admin.pool'),
+                [],
+                (new ReferenceConfigurator('doctrine'))->nullOnInvalid(),
+            ])
+
+        ->set(ListAdminCommand::class, ListAdminCommand::class)
+            ->public()
+            ->tag('console.command')
+            ->args([
+                new ReferenceConfigurator('sonata.admin.pool'),
+            ])
+
+        ->set(SetupAclCommand::class, SetupAclCommand::class)
+            ->public()
+            ->tag('console.command')
+            ->args([
+                new ReferenceConfigurator('sonata.admin.pool'),
+                new ReferenceConfigurator('sonata.admin.manipulator.acl.admin'),
+            ])
+    ;
+};
diff --git a/src/Resources/config/commands.xml b/src/Resources/config/commands.xml