Move EventListener directory to EventSubscriber directory

Setono · Aug 14, 2023 · 0fa30dc · 0fa30dc
1 parent 1ec04ab
commit 0fa30dc
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 27 deletions.
diff --git a/src/EventListener/ControllerSubscriber.php → src/EventSubscriber/ControllerSubscriber.php b/src/EventListener/ControllerSubscriber.php → src/EventSubscriber/ControllerSubscriber.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Setono\SyliusRedirectPlugin\EventListener;
+namespace Setono\SyliusRedirectPlugin\EventSubscriber;
 
 use Doctrine\Persistence\ObjectManager;
 use Setono\SyliusRedirectPlugin\Resolver\RedirectionPathResolverInterface;

diff --git a/src/EventListener/NotFoundSubscriber.php → src/EventSubscriber/NotFoundSubscriber.php b/src/EventListener/NotFoundSubscriber.php → src/EventSubscriber/NotFoundSubscriber.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Setono\SyliusRedirectPlugin\EventListener;
+namespace Setono\SyliusRedirectPlugin\EventSubscriber;
 
 use Doctrine\Persistence\ObjectManager;
 use Setono\SyliusRedirectPlugin\Resolver\RedirectionPathResolverInterface;

diff --git a/src/EventListener/RedirectResponseTrait.php → ...EventSubscriber/RedirectResponseTrait.php b/src/EventListener/RedirectResponseTrait.php → ...EventSubscriber/RedirectResponseTrait.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Setono\SyliusRedirectPlugin\EventListener;
+namespace Setono\SyliusRedirectPlugin\EventSubscriber;
 
 use League\Uri\Uri;
 use League\Uri\UriModifier;

diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -5,7 +5,6 @@
     <imports>
         <import resource="services/command.xml"/>
         <import resource="services/constraint.xml"/>
-        <import resource="services/event_listener.xml"/>
         <import resource="services/event_subscriber.xml"/>
         <import resource="services/factory.xml"/>
         <import resource="services/finder.xml"/>

diff --git a/src/Resources/config/services/event_listener.xml b/src/Resources/config/services/event_listener.xml
diff --git a/src/Resources/config/services/event_subscriber.xml b/src/Resources/config/services/event_subscriber.xml
@@ -8,5 +8,21 @@
                  class="Setono\SyliusRedirectPlugin\EventSubscriber\AdminMenuSubscriber">
             <tag name="kernel.event_subscriber"/>
         </service>
+
+        <service id="setono_sylius_redirect.event_listener.controller"
+                 class="Setono\SyliusRedirectPlugin\EventSubscriber\ControllerSubscriber">
+            <argument type="service" id="setono_sylius_redirect.manager.redirect"/>
+            <argument type="service" id="sylius.context.channel"/>
+            <argument type="service" id="setono_sylius_redirect.resolver.redirection_path"/>
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
+        <service id="setono_sylius_redirect.event_listener.not_found"
+                 class="Setono\SyliusRedirectPlugin\EventSubscriber\NotFoundSubscriber">
+            <argument type="service" id="setono_sylius_redirect.manager.redirect"/>
+            <argument type="service" id="sylius.context.channel"/>
+            <argument type="service" id="setono_sylius_redirect.resolver.redirection_path"/>
+            <tag name="kernel.event_subscriber"/>
+        </service>
     </services>
 </container>