From 819f2c9e5d14906f04e5eb08cdb104633c036e0c Mon Sep 17 00:00:00 2001
From: Konstantin Grachev <me@grachevko.ru>
Date: Mon, 28 Jun 2021 11:31:47 +0300
Subject: [PATCH] Refactoring: yaml to php di, fix directory struct

---
 src/DependencyInjection/NsqExtension.php       |  4 ++--
 .../AckUnrecoverableMessageListener.php        |  3 ++-
 src/Resources/config/services.yml              |  9 ---------
 src/config/services.php                        | 18 ++++++++++++++++++
 4 files changed, 22 insertions(+), 12 deletions(-)
 rename src/{Messenger => EventListener}/AckUnrecoverableMessageListener.php (90%)
 delete mode 100644 src/Resources/config/services.yml
 create mode 100644 src/config/services.php

diff --git a/src/DependencyInjection/NsqExtension.php b/src/DependencyInjection/NsqExtension.php
index bc486d3..c1f3ce3 100644
--- a/src/DependencyInjection/NsqExtension.php
+++ b/src/DependencyInjection/NsqExtension.php
@@ -14,7 +14,7 @@ class NsqExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container): void
     {
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('services.yml');
+        $loader = new Loader\PhpFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader->load('services.php');
     }
 }
diff --git a/src/Messenger/AckUnrecoverableMessageListener.php b/src/EventListener/AckUnrecoverableMessageListener.php
similarity index 90%
rename from src/Messenger/AckUnrecoverableMessageListener.php
rename to src/EventListener/AckUnrecoverableMessageListener.php
index eee6ca7..3a51966 100644
--- a/src/Messenger/AckUnrecoverableMessageListener.php
+++ b/src/EventListener/AckUnrecoverableMessageListener.php
@@ -1,8 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace Nsq\NsqBundle\Messenger;
+namespace Nsq\NsqBundle\EventListener;
 
+use Nsq\NsqBundle\Messenger\NsqReceivedStamp;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;
 use function Amp\Promise\wait;
diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
deleted file mode 100644
index 85f8187..0000000
--- a/src/Resources/config/services.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-services:
-    Nsq\NsqBundle\Messenger\NsqTransportFactory:
-        tags:
-            - 'messenger.transport_factory'
-            - 'container.no_preload'
-
-    Nsq\NsqBundle\Messenger\AckUnrecoverableMessageListener:
-        tags:
-            - { name: kernel.event_subscriber }
diff --git a/src/config/services.php b/src/config/services.php
new file mode 100644
index 0000000..31858fb
--- /dev/null
+++ b/src/config/services.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $configurator): void {
+    $services = $configurator->services();
+
+    $services->set(Nsq\NsqBundle\Messenger\NsqTransportFactory::class)
+        ->tag('messenger.transport_factory')
+        ->tag('container.no_preload')
+        ;
+
+    $services->set(\Nsq\NsqBundle\EventListener\AckUnrecoverableMessageListener::class)
+        ->tag('kernel.event_subscriber')
+        ;
+};