Skip to content

Commit 633a09c

Browse files
committed
Migrate service configuration from XML to PHP
1 parent 32f7f98 commit 633a09c

File tree

14 files changed

+8
-442
lines changed

14 files changed

+8
-442
lines changed

src/DependencyInjection/FOSElasticaExtension.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
use Symfony\Component\DependencyInjection\ContainerBuilder;
2525
use Symfony\Component\DependencyInjection\Exception\LogicException;
2626
use Symfony\Component\DependencyInjection\Extension\Extension;
27-
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
27+
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
2828
use Symfony\Component\DependencyInjection\Reference;
2929
use Symfony\Component\Messenger\MessageBusInterface;
3030

@@ -72,15 +72,15 @@ public function load(array $configs, ContainerBuilder $container): void
7272
$configuration = $this->getConfiguration($configs, $container);
7373
$config = $this->processConfiguration($configuration, $configs);
7474

75-
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
75+
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../config'));
7676

7777
if (empty($config['clients']) || empty($config['indexes'])) {
7878
// No Clients or indexes are defined
7979
return;
8080
}
8181

8282
foreach (['config', 'index', 'persister', 'provider', 'source', 'transformer', 'event_listener', 'commands'] as $basename) {
83-
$loader->load(\sprintf('%s.xml', $basename));
83+
$loader->load(\sprintf('%s.php', $basename));
8484
}
8585

8686
if (empty($config['default_client'])) {
@@ -98,7 +98,7 @@ public function load(array $configs, ContainerBuilder $container): void
9898
}
9999

100100
if (isset($config['serializer'])) {
101-
$loader->load('serializer.xml');
101+
$loader->load('serializer.php');
102102

103103
$this->loadSerializer($config['serializer'], $container);
104104
}
@@ -759,8 +759,8 @@ private function loadDriver(ContainerBuilder $container, string $driver): void
759759
return;
760760
}
761761

762-
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
763-
$loader->load($driver.'.xml');
762+
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../config'));
763+
$loader->load($driver.'.php');
764764
$this->loadedDrivers[] = $driver;
765765
}
766766

@@ -820,13 +820,13 @@ private function getClient(string $clientName): Reference
820820
return $this->clients[$clientName]['reference'];
821821
}
822822

823-
private function registerMessengerConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader): void
823+
private function registerMessengerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
824824
{
825825
if (!\interface_exists(MessageBusInterface::class)) {
826826
throw new LogicException('Messenger support cannot be enabled as the Messenger component is not installed. Try running "composer require symfony/messenger".');
827827
}
828828

829-
$loader->load('messenger.xml');
829+
$loader->load('messenger.php');
830830

831831
$container->setAlias('fos_elastica.messenger.bus', $config['bus']);
832832
}

src/Resources/config/commands.xml

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

src/Resources/config/config.xml

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

src/Resources/config/event_listener.xml

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

src/Resources/config/index.xml

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

src/Resources/config/messenger.xml

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

src/Resources/config/mongodb.xml

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

src/Resources/config/orm.xml

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

0 commit comments

Comments
 (0)