Skip to content

Commit 51f6f3a

Browse files
relthygrelthyg
committed
Convert configs from XML to PHP
1 parent 38966f8 commit 51f6f3a

19 files changed

Lines changed: 148 additions & 194 deletions

‎DependencyInjection/CraueFormFlowExtension.php‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
88
use Symfony\Component\DependencyInjection\ContainerBuilder;
99
use Symfony\Component\DependencyInjection\Extension\Extension;
10-
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
10+
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
1111

1212
/**
1313
* Registration of the extension via DI.
@@ -23,12 +23,11 @@ class CraueFormFlowExtension extends Extension implements CompilerPassInterface
2323
/**
2424
* @return void
2525
*/
26-
public function load(array $config, ContainerBuilder $container): void
27-
{
28-
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
29-
$loader->load('form_flow.xml');
30-
$loader->load('twig.xml');
31-
$loader->load('util.xml');
26+
public function load(array $config, ContainerBuilder $container) {
27+
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
28+
$loader->load('form_flow.php');
29+
$loader->load('twig.php');
30+
$loader->load('util.php');
3231

3332
$container->registerForAutoconfiguration(FormFlowInterface::class)->addTag(self::FORM_FLOW_TAG);
3433
}

‎Resources/config/form_flow.php‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?php
2+
3+
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
4+
5+
return static function (ContainerConfigurator $container) {
6+
$services = $container->services();
7+
$parameters = $container->parameters();
8+
$parameters->set('craue.form.flow.class', \Craue\FormFlowBundle\Form\FormFlow::class);
9+
$parameters->set('craue.form.flow.storage.class', \Craue\FormFlowBundle\Storage\SessionStorage::class);
10+
$parameters->set('craue.form.flow.event_listener.previous_step_invalid.class', \Craue\FormFlowBundle\EventListener\PreviousStepInvalidEventListener::class);
11+
$parameters->set('craue.form.flow.event_listener.previous_step_invalid.event', \Craue\FormFlowBundle\Form\FormFlowEvents::PREVIOUS_STEP_INVALID);
12+
$parameters->set('craue.form.flow.event_listener.flow_expired.class', \Craue\FormFlowBundle\EventListener\FlowExpiredEventListener::class);
13+
$parameters->set('craue.form.flow.event_listener.flow_expired.event', \Craue\FormFlowBundle\Form\FormFlowEvents::FLOW_EXPIRED);
14+
15+
$services->set('craue.form.flow.storage_default', '%craue.form.flow.storage.class%')
16+
->private()
17+
->args([service('request_stack')]);
18+
19+
$services->alias('craue.form.flow.storage', 'craue.form.flow.storage_default')
20+
->public();
21+
22+
$services->set('craue.form.flow.data_manager_default', \Craue\FormFlowBundle\Storage\DataManager::class)
23+
->private()
24+
->args([service('craue.form.flow.storage')]);
25+
26+
$services->alias('craue.form.flow.data_manager', 'craue.form.flow.data_manager_default');
27+
28+
$services->set('craue.form.flow', '%craue.form.flow.class%')
29+
->call('setDataManager', [service('craue.form.flow.data_manager')])
30+
->call('setFormFactory', [service('form.factory')])
31+
->call('setRequestStack', [service('request_stack')])
32+
->call('setEventDispatcher', [service('event_dispatcher')->ignoreOnInvalid()]);
33+
34+
$services->set('craue.form.flow.form_extension', \Craue\FormFlowBundle\Form\Extension\FormFlowFormExtension::class)
35+
->tag('form.type_extension', ['extended_type' => \Symfony\Component\Form\Extension\Core\Type\FormType::class]);
36+
37+
$services->set('craue.form.flow.hidden_field_extension', \Craue\FormFlowBundle\Form\Extension\FormFlowHiddenFieldExtension::class)
38+
->tag('form.type_extension', ['extended_type' => \Symfony\Component\Form\Extension\Core\Type\HiddenType::class]);
39+
40+
$services->set('craue.form.flow.event_listener.previous_step_invalid', '%craue.form.flow.event_listener.previous_step_invalid.class%')
41+
->tag('kernel.event_listener', ['event' => '%craue.form.flow.event_listener.previous_step_invalid.event%', 'method' => 'onPreviousStepInvalid'])
42+
->call('setTranslator', [service('translator')]);
43+
44+
$services->set('craue.form.flow.event_listener.flow_expired', '%craue.form.flow.event_listener.flow_expired.class%')
45+
->tag('kernel.event_listener', ['event' => '%craue.form.flow.event_listener.flow_expired.event%', 'method' => 'onFlowExpired'])
46+
->call('setTranslator', [service('translator')]);
47+
};

‎Resources/config/form_flow.xml‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎Resources/config/twig.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
3+
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
4+
5+
return static function (ContainerConfigurator $container) {
6+
$services = $container->services();
7+
$parameters = $container->parameters();
8+
$parameters->set('craue_twig_extensions.formflow.class', \Craue\FormFlowBundle\Twig\Extension\FormFlowExtension::class);
9+
10+
$services->set('twig.extension.craue_formflow', '%craue_twig_extensions.formflow.class%')
11+
->tag('twig.extension')
12+
->call('setFormFlowUtil', [service('craue_formflow_util')]);
13+
};

‎Resources/config/twig.xml‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎Resources/config/util.php‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?php
2+
3+
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
4+
5+
return static function (ContainerConfigurator $container) {
6+
$services = $container->services();
7+
$parameters = $container->parameters();
8+
$parameters->set('craue_formflow.util.class', \Craue\FormFlowBundle\Util\FormFlowUtil::class);
9+
10+
$services->set('craue_formflow_util', '%craue_formflow.util.class%')
11+
->public();
12+
13+
$services->alias(\Craue\FormFlowBundle\Util\FormFlowUtil::class, 'craue_formflow_util')
14+
->private();
15+
};

‎Resources/config/util.xml‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎Tests/IntegrationTestBundle/DependencyInjection/Compiler/DoctrineStorageCompilerPass.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Symfony\Component\Config\FileLocator;
66
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
77
use Symfony\Component\DependencyInjection\ContainerBuilder;
8+
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
89
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
910

1011
/**
@@ -18,8 +19,8 @@ class DoctrineStorageCompilerPass implements CompilerPassInterface {
1819

1920
public function process(ContainerBuilder $container) : void {
2021
if ($container->has('doctrine.dbal.default_connection')) {
21-
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../../Resources/config'));
22-
$loader->load('doctrine_storage.xml');
22+
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../Resources/config'));
23+
$loader->load('doctrine_storage.php');
2324
}
2425
}
2526

‎Tests/IntegrationTestBundle/Resources/config/controller.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
3+
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
4+
5+
return static function (ContainerConfigurator $container) {
6+
$services = $container->services();
7+
$parameters = $container->parameters();
8+
9+
$services->load('Craue\\FormFlowBundle\\Tests\\IntegrationTestBundle\\Controller\\', '../../Controller/*')
10+
->autowire()
11+
->autoconfigure();
12+
};

‎Tests/IntegrationTestBundle/Resources/config/controller.xml‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)