Skip to content

Commit 302a6cb

Browse files
committed
Migrate service config from XML to PHP
1 parent abea9b4 commit 302a6cb

25 files changed

+282
-318
lines changed

src/DependencyInjection/StofDoctrineExtensionsExtension.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Symfony\Component\DependencyInjection\Alias;
88
use Symfony\Component\Config\Definition\Processor;
99
use Symfony\Component\DependencyInjection\Extension\Extension;
10-
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
10+
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
1111
use Symfony\Component\Config\FileLocator;
1212
use Symfony\Component\DependencyInjection\ContainerBuilder;
1313

@@ -100,8 +100,8 @@ public function load(array $configs, ContainerBuilder $container)
100100

101101
$config = $processor->processConfiguration($configuration, $configs);
102102

103-
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
104-
$loader->load('tool.xml');
103+
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
104+
$loader->load('tool.php');
105105

106106
$loaded = array();
107107

@@ -198,7 +198,7 @@ private function processObjectManagerConfigurations(array $configs, ContainerBui
198198
}
199199

200200
if (!isset($loaded[$ext])) {
201-
$loader->load($ext.'.xml');
201+
$loader->load($ext.'.php');
202202
$loaded[$ext] = true;
203203
}
204204

src/Resources/config/blameable.php

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?php
2+
3+
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
4+
5+
use Gedmo\Blameable\BlameableListener;
6+
use Stof\DoctrineExtensionsBundle\EventListener\BlameListener;
7+
8+
return static function (ContainerConfigurator $container): void {
9+
$container->parameters()
10+
->set('stof_doctrine_extensions.listener.blameable.class', BlameableListener::class)
11+
->set('stof_doctrine_extensions.event_listener.blame.class', BlameListener::class) /** @phpstan-ignore classConstant.deprecatedClass */
12+
;
13+
14+
$container->services()
15+
->set('stof_doctrine_extensions.listener.blameable', param('stof_doctrine_extensions.listener.blameable.class'))
16+
->call('setCacheItemPool', [service('stof_doctrine_extensions.metadata_cache')])
17+
->call('setAnnotationReader', [service('.stof_doctrine_extensions.reader')->ignoreOnInvalid()])
18+
->call('setActorProvider', [service('stof_doctrine_extensions.tool.actor_provider')])
19+
20+
->set('stof_doctrine_extensions.event_listener.blame', param('stof_doctrine_extensions.event_listener.blame.class'))
21+
->deprecate('stof/doctrine-extensions-bundle', '1.14', 'The "%service_id%" service is deprecated and will be removed in 2.0. The "stof_doctrine_extensions.tool.actor_provider" service should be used to provide the user instead.')
22+
->args([
23+
service('stof_doctrine_extensions.listener.blameable'),
24+
service('security.token_storage')->nullOnInvalid(),
25+
service('security.authorization_checker')->nullOnInvalid(),
26+
])
27+
;
28+
};

src/Resources/config/blameable.xml

Lines changed: 0 additions & 31 deletions
This file was deleted.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
3+
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
4+
5+
use Gedmo\IpTraceable\IpTraceableListener;
6+
7+
return static function (ContainerConfigurator $container): void {
8+
$container->services()
9+
->set('stof_doctrine_extensions.listener.ip_traceable', IpTraceableListener::class)
10+
->call('setCacheItemPool', [service('stof_doctrine_extensions.metadata_cache')])
11+
->call('setAnnotationReader', [service('.stof_doctrine_extensions.reader')->ignoreOnInvalid()])
12+
->call('setIpAddressProvider', [service('stof_doctrine_extensions.tool.ip_address_provider')])
13+
;
14+
};

src/Resources/config/ip_traceable.xml

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

src/Resources/config/loggable.php

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?php
2+
3+
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
4+
5+
use Gedmo\Loggable\LoggableListener;
6+
use Stof\DoctrineExtensionsBundle\EventListener\LoggerListener;
7+
8+
return static function (ContainerConfigurator $container): void {
9+
$container->parameters()
10+
->set('stof_doctrine_extensions.listener.loggable.class', LoggableListener::class)
11+
->set('stof_doctrine_extensions.event_listener.logger.class', LoggerListener::class) /** @phpstan-ignore classConstant.deprecatedClass */
12+
;
13+
14+
$container->services()
15+
->set('stof_doctrine_extensions.listener.loggable', param('stof_doctrine_extensions.listener.loggable.class'))
16+
->call('setCacheItemPool', [service('stof_doctrine_extensions.metadata_cache')])
17+
->call('setAnnotationReader', [service('.stof_doctrine_extensions.reader')->ignoreOnInvalid()])
18+
->call('setActorProvider', [service('stof_doctrine_extensions.tool.actor_provider')])
19+
20+
->set('stof_doctrine_extensions.event_listener.logger', param('stof_doctrine_extensions.event_listener.logger.class'))
21+
->deprecate('stof/doctrine-extensions-bundle', '1.14', 'The "%service_id%" service is deprecated and will be removed in 2.0. The "stof_doctrine_extensions.tool.actor_provider" service should be used to provide the user instead.')
22+
->args([
23+
service('stof_doctrine_extensions.listener.loggable'),
24+
service('security.token_storage')->nullOnInvalid(),
25+
service('security.authorization_checker')->nullOnInvalid(),
26+
])
27+
;
28+
};

src/Resources/config/loggable.xml

Lines changed: 0 additions & 31 deletions
This file was deleted.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
3+
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
4+
5+
use Gedmo\ReferenceIntegrity\ReferenceIntegrityListener;
6+
7+
return static function (ContainerConfigurator $container): void {
8+
$container->parameters()
9+
->set('stof_doctrine_extensions.listener.reference_integrity.class', ReferenceIntegrityListener::class)
10+
;
11+
12+
$container->services()
13+
->set('stof_doctrine_extensions.listener.reference_integrity', param('stof_doctrine_extensions.listener.reference_integrity.class'))
14+
->call('setCacheItemPool', [service('stof_doctrine_extensions.metadata_cache')])
15+
->call('setAnnotationReader', [service('.stof_doctrine_extensions.reader')->ignoreOnInvalid()])
16+
;
17+
};

src/Resources/config/reference_integrity.xml

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

src/Resources/config/sluggable.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
3+
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
4+
5+
use Gedmo\Sluggable\SluggableListener;
6+
7+
return static function (ContainerConfigurator $container): void {
8+
$container->parameters()
9+
->set('stof_doctrine_extensions.listener.sluggable.class', SluggableListener::class)
10+
;
11+
12+
$container->services()
13+
->set('stof_doctrine_extensions.listener.sluggable', param('stof_doctrine_extensions.listener.sluggable.class'))
14+
->call('setCacheItemPool', [service('stof_doctrine_extensions.metadata_cache')])
15+
->call('setAnnotationReader', [service('.stof_doctrine_extensions.reader')->ignoreOnInvalid()])
16+
;
17+
};

0 commit comments

Comments
 (0)