From 5a22d7c1523f2195f05069c80301421592e2ceef Mon Sep 17 00:00:00 2001
From: Sebastian Fischer <typo3@evoweb.de>
Date: Fri, 17 May 2024 18:42:18 +0200
Subject: [PATCH] Refactory event listener registration

---
 Classes/EventListener/CssMerger.php | 2 ++
 Classes/EventListener/JsMerger.php  | 2 ++
 Configuration/Services.yaml         | 6 ------
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Classes/EventListener/CssMerger.php b/Classes/EventListener/CssMerger.php
index dfd8de0..cd47be5 100755
--- a/Classes/EventListener/CssMerger.php
+++ b/Classes/EventListener/CssMerger.php
@@ -2,6 +2,7 @@
 
 namespace Evoweb\EwBase\EventListener;
 
+use TYPO3\CMS\Core\Attribute\AsEventListener;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Page\AssetCollector;
 use TYPO3\CMS\Core\Page\Event\BeforeStylesheetsRenderingEvent;
@@ -14,6 +15,7 @@ class CssMerger
     {
     }
 
+    #[AsEventListener('evoweb-ew-base-beforestylesheets', BeforeStylesheetsRenderingEvent::class)]
     public function __invoke(BeforeStylesheetsRenderingEvent $event): void
     {
         if ($event->isInline() && $event->isPriority()) {
diff --git a/Classes/EventListener/JsMerger.php b/Classes/EventListener/JsMerger.php
index 52d7381..7944435 100755
--- a/Classes/EventListener/JsMerger.php
+++ b/Classes/EventListener/JsMerger.php
@@ -2,6 +2,7 @@
 
 namespace Evoweb\EwBase\EventListener;
 
+use TYPO3\CMS\Core\Attribute\AsEventListener;
 use TYPO3\CMS\Core\Page\AssetCollector;
 use TYPO3\CMS\Core\Page\Event\BeforeJavaScriptsRenderingEvent;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -9,6 +10,7 @@ use TYPO3\CMS\Core\Utility\PathUtility;
 
 class JsMerger
 {
+    #[AsEventListener('evoweb-ew-base-beforejavascript', BeforeJavaScriptsRenderingEvent::class)]
     public function __invoke(BeforeJavaScriptsRenderingEvent $event): void
     {
         if ($event->isInline() && $event->isPriority()) {
diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
index 7654eb3..b684568 100755
--- a/Configuration/Services.yaml
+++ b/Configuration/Services.yaml
@@ -14,12 +14,6 @@ services:
         description: 'Command to list all content elements for a given subtree'
         schedulable: false
 
-  Evoweb\EwBase\EventListener\CssMerger:
-    tags: ['event.listener']
-
-  Evoweb\EwBase\EventListener\JsMerger:
-    tags: ['event.listener']
-
   Evoweb\EwBase\ToolbarItems\ReleaseToolbarItem:
     tags: ['backend.toolbar.item']