From b69ae965bf77eb1639cb254472b6e3bb0ceb7c2d Mon Sep 17 00:00:00 2001 From: Maciej Koprek Date: Sun, 7 Dec 2025 22:16:44 +0100 Subject: [PATCH 1/2] Remove deprecations for Symfony 7.4 - XML is deprecated --- .../OldSoundRabbitMqExtension.php | 9 ++- Resources/config/rabbitmq.xml | 76 ----------------- Resources/config/services.yaml | 81 +++++++++++++++++++ 3 files changed, 88 insertions(+), 78 deletions(-) delete mode 100644 Resources/config/rabbitmq.xml create mode 100644 Resources/config/services.yaml diff --git a/DependencyInjection/OldSoundRabbitMqExtension.php b/DependencyInjection/OldSoundRabbitMqExtension.php index ddb98ec0..8623029d 100644 --- a/DependencyInjection/OldSoundRabbitMqExtension.php +++ b/DependencyInjection/OldSoundRabbitMqExtension.php @@ -11,7 +11,9 @@ use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Extension\Extension; +use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; +use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; use Symfony\Component\DependencyInjection\Reference; /** @@ -40,8 +42,11 @@ public function load(array $configs, ContainerBuilder $container): void { $this->container = $container; - $loader = new XmlFileLoader($this->container, new FileLocator([__DIR__ . '/../Resources/config'])); - $loader->load('rabbitmq.xml'); + $loader = new YamlFileLoader( + $container, + new FileLocator(__DIR__ . '/../Resources/config') + ); + $loader->load('services.yaml'); $configuration = $this->getConfiguration($configs, $container); $this->config = $this->processConfiguration($configuration, $configs); diff --git a/Resources/config/rabbitmq.xml b/Resources/config/rabbitmq.xml deleted file mode 100644 index f5d15794..00000000 --- a/Resources/config/rabbitmq.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - PhpAmqpLib\Connection\AMQPStreamConnection - PhpAmqpLib\Connection\AMQPSocketConnection - PhpAmqpLib\Connection\AMQPLazyConnection - PhpAmqpLib\Connection\AMQPLazySocketConnection - OldSound\RabbitMqBundle\RabbitMq\AMQPConnectionFactory - OldSound\RabbitMqBundle\RabbitMq\Binding - OldSound\RabbitMqBundle\RabbitMq\Producer - OldSound\RabbitMqBundle\RabbitMq\Consumer - OldSound\RabbitMqBundle\RabbitMq\MultipleConsumer - OldSound\RabbitMqBundle\RabbitMq\DynamicConsumer - OldSound\RabbitMqBundle\RabbitMq\BatchConsumer - OldSound\RabbitMqBundle\RabbitMq\AnonConsumer - OldSound\RabbitMqBundle\RabbitMq\RpcClient - OldSound\RabbitMqBundle\RabbitMq\RpcServer - OldSound\RabbitMqBundle\RabbitMq\AMQPLoggedChannel - OldSound\RabbitMqBundle\DataCollector\MessageDataCollector - OldSound\RabbitMqBundle\RabbitMq\AmqpPartsHolder - OldSound\RabbitMqBundle\RabbitMq\Fallback - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Resources/config/services.yaml b/Resources/config/services.yaml new file mode 100644 index 00000000..d6af2c67 --- /dev/null +++ b/Resources/config/services.yaml @@ -0,0 +1,81 @@ +parameters: + old_sound_rabbit_mq.connection.class: PhpAmqpLib\Connection\AMQPStreamConnection + old_sound_rabbit_mq.socket_connection.class: PhpAmqpLib\Connection\AMQPSocketConnection + old_sound_rabbit_mq.lazy.connection.class: PhpAmqpLib\Connection\AMQPLazyConnection + old_sound_rabbit_mq.lazy.socket_connection.class: PhpAmqpLib\Connection\AMQPLazySocketConnection + old_sound_rabbit_mq.connection_factory.class: OldSound\RabbitMqBundle\RabbitMq\AMQPConnectionFactory + old_sound_rabbit_mq.binding.class: OldSound\RabbitMqBundle\RabbitMq\Binding + old_sound_rabbit_mq.producer.class: OldSound\RabbitMqBundle\RabbitMq\Producer + old_sound_rabbit_mq.consumer.class: OldSound\RabbitMqBundle\RabbitMq\Consumer + old_sound_rabbit_mq.multi_consumer.class: OldSound\RabbitMqBundle\RabbitMq\MultipleConsumer + old_sound_rabbit_mq.dynamic_consumer.class: OldSound\RabbitMqBundle\RabbitMq\DynamicConsumer + old_sound_rabbit_mq.batch_consumer.class: OldSound\RabbitMqBundle\RabbitMq\BatchConsumer + old_sound_rabbit_mq.anon_consumer.class: OldSound\RabbitMqBundle\RabbitMq\AnonConsumer + old_sound_rabbit_mq.rpc_client.class: OldSound\RabbitMqBundle\RabbitMq\RpcClient + old_sound_rabbit_mq.rpc_server.class: OldSound\RabbitMqBundle\RabbitMq\RpcServer + old_sound_rabbit_mq.logged.channel.class: OldSound\RabbitMqBundle\RabbitMq\AMQPLoggedChannel + old_sound_rabbit_mq.data_collector.class: OldSound\RabbitMqBundle\DataCollector\MessageDataCollector + old_sound_rabbit_mq.parts_holder.class: OldSound\RabbitMqBundle\RabbitMq\AmqpPartsHolder + old_sound_rabbit_mq.fallback.class: OldSound\RabbitMqBundle\RabbitMq\Fallback + +services: + old_sound_rabbit_mq.data_collector: + class: '%old_sound_rabbit_mq.data_collector.class%' + arguments: + - [] + tags: + - { name: 'data_collector', template: '@OldSoundRabbitMq/Collector/collector.html.twig', id: 'rabbit_mq' } + + old_sound_rabbit_mq.parts_holder: + class: '%old_sound_rabbit_mq.parts_holder.class%' + public: true + + old_sound_rabbit_mq.anon_consumer_command: + class: OldSound\RabbitMqBundle\Command\AnonConsumerCommand + tags: + - { name: 'console.command', command: 'rabbitmq:anon-consumer' } + + old_sound_rabbit_mq.batch_consumer_command: + class: OldSound\RabbitMqBundle\Command\BatchConsumerCommand + tags: + - { name: 'console.command', command: 'rabbitmq:batch:consumer' } + + old_sound_rabbit_mq.consumer_command: + class: OldSound\RabbitMqBundle\Command\ConsumerCommand + tags: + - { name: 'console.command', command: 'rabbitmq:consumer' } + + old_sound_rabbit_mq.delete_command: + class: OldSound\RabbitMqBundle\Command\DeleteCommand + tags: + - { name: 'console.command', command: 'rabbitmq:delete' } + + old_sound_rabbit_mq.dynamic_consumer_command: + class: OldSound\RabbitMqBundle\Command\DynamicConsumerCommand + tags: + - { name: 'console.command', command: 'rabbitmq:dynamic-consumer' } + + old_sound_rabbit_mq.multiple_consumer_command: + class: OldSound\RabbitMqBundle\Command\MultipleConsumerCommand + tags: + - { name: 'console.command', command: 'rabbitmq:multiple-consumer' } + + old_sound_rabbit_mq.purge_consumer_command: + class: OldSound\RabbitMqBundle\Command\PurgeConsumerCommand + tags: + - { name: 'console.command', command: 'rabbitmq:purge' } + + old_sound_rabbit_mq.command.rpc_server_command: + class: OldSound\RabbitMqBundle\Command\RpcServerCommand + tags: + - { name: 'console.command', command: 'rabbitmq:rpc-server' } + + old_sound_rabbit_mq.command.setup_fabric_command: + class: OldSound\RabbitMqBundle\Command\SetupFabricCommand + tags: + - { name: 'console.command', command: 'rabbitmq:setup-fabric' } + + old_sound_rabbit_mq.command.std_in_producer_command: + class: OldSound\RabbitMqBundle\Command\StdInProducerCommand + tags: + - { name: 'console.command', command: 'rabbitmq:stdin-producer' } From b07db00065d644a40fc2c40b45eadb6a1545ce9f Mon Sep 17 00:00:00 2001 From: Maciej Koprek Date: Sun, 7 Dec 2025 22:19:03 +0100 Subject: [PATCH 2/2] Unused use --- DependencyInjection/OldSoundRabbitMqExtension.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/DependencyInjection/OldSoundRabbitMqExtension.php b/DependencyInjection/OldSoundRabbitMqExtension.php index 8623029d..735a5480 100644 --- a/DependencyInjection/OldSoundRabbitMqExtension.php +++ b/DependencyInjection/OldSoundRabbitMqExtension.php @@ -11,8 +11,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Extension\Extension; -use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; -use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; use Symfony\Component\DependencyInjection\Reference;