From 43a68b96aebeb74c1e490a35a6ff2a029461f198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Fri, 21 Jun 2024 23:41:22 +0200
Subject: [PATCH] Moved deprecated doctrine subscribers to doctrine event
 listeners

---
 config/services.yaml                           |  8 +-------
 .../LogSystem/EventLoggerListener.php}         | 18 ++++++------------
 .../LogSystem/LogDBMigrationListener.php}      |  8 +++++---
 3 files changed, 12 insertions(+), 22 deletions(-)
 rename src/{EventSubscriber/LogSystem/EventLoggerSubscriber.php => EventListener/LogSystem/EventLoggerListener.php} (97%)
 rename src/{EventSubscriber/LogSystem/LogDBMigrationSubscriber.php => EventListener/LogSystem/LogDBMigrationListener.php} (92%)

diff --git a/config/services.yaml b/config/services.yaml
index 0e30ab14..2d31b483 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -76,18 +76,12 @@ services:
             # Only the event classes specified here are saved to DB (set to []) to log all events
             $whitelist: []
 
-    App\EventSubscriber\LogSystem\EventLoggerSubscriber:
+    App\EventListener\LogSystem\EventLoggerListener:
         arguments:
             $save_changed_fields: '%env(bool:HISTORY_SAVE_CHANGED_FIELDS)%'
             $save_changed_data: '%env(bool:HISTORY_SAVE_CHANGED_DATA)%'
             $save_removed_data: '%env(bool:HISTORY_SAVE_REMOVED_DATA)%'
             $save_new_data: '%env(bool:HISTORY_SAVE_NEW_DATA)%'
-        tags:
-            - { name: 'doctrine.event_subscriber' }
-
-    App\EventSubscriber\LogSystem\LogDBMigrationSubscriber:
-        tags:
-            - { name: 'doctrine.event_subscriber' }
 
     App\Form\AttachmentFormType:
         arguments:
diff --git a/src/EventSubscriber/LogSystem/EventLoggerSubscriber.php b/src/EventListener/LogSystem/EventLoggerListener.php
similarity index 97%
rename from src/EventSubscriber/LogSystem/EventLoggerSubscriber.php
rename to src/EventListener/LogSystem/EventLoggerListener.php
index b3f07a9b..6fe3d8dc 100644
--- a/src/EventSubscriber/LogSystem/EventLoggerSubscriber.php
+++ b/src/EventListener/LogSystem/EventLoggerListener.php
@@ -20,7 +20,7 @@
 
 declare(strict_types=1);
 
-namespace App\EventSubscriber\LogSystem;
+namespace App\EventListener\LogSystem;
 
 use App\Entity\Attachments\Attachment;
 use App\Entity\Base\AbstractDBElement;
@@ -38,7 +38,7 @@ use App\Entity\UserSystem\User;
 use App\Services\LogSystem\EventCommentHelper;
 use App\Services\LogSystem\EventLogger;
 use App\Services\LogSystem\EventUndoHelper;
-use Doctrine\Common\EventSubscriber;
+use Doctrine\Bundle\DoctrineBundle\Attribute\AsDoctrineListener;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Event\OnFlushEventArgs;
 use Doctrine\ORM\Event\PostFlushEventArgs;
@@ -50,7 +50,10 @@ use Symfony\Component\Serializer\SerializerInterface;
 /**
  * This event subscriber writes to the event log when entities are changed, removed, created.
  */
-class EventLoggerSubscriber implements EventSubscriber
+#[AsDoctrineListener(event: Events::onFlush)]
+#[AsDoctrineListener(event: Events::postPersist)]
+#[AsDoctrineListener(event: Events::postFlush)]
+class EventLoggerListener
 {
     /**
      * @var array The given fields will not be saved, because they contain sensitive information
@@ -187,15 +190,6 @@ class EventLoggerSubscriber implements EventSubscriber
         return true;
     }
 
-    public function getSubscribedEvents(): array
-    {
-        return[
-            Events::onFlush,
-            Events::postPersist,
-            Events::postFlush,
-        ];
-    }
-
     protected function logElementDeleted(AbstractDBElement $entity, EntityManagerInterface $em): void
     {
         $log = new ElementDeletedLogEntry($entity);
diff --git a/src/EventSubscriber/LogSystem/LogDBMigrationSubscriber.php b/src/EventListener/LogSystem/LogDBMigrationListener.php
similarity index 92%
rename from src/EventSubscriber/LogSystem/LogDBMigrationSubscriber.php
rename to src/EventListener/LogSystem/LogDBMigrationListener.php
index 07ec8ea4..c8b60e18 100644
--- a/src/EventSubscriber/LogSystem/LogDBMigrationSubscriber.php
+++ b/src/EventListener/LogSystem/LogDBMigrationListener.php
@@ -20,11 +20,11 @@
 
 declare(strict_types=1);
 
-namespace App\EventSubscriber\LogSystem;
+namespace App\EventListener\LogSystem;
 
 use App\Entity\LogSystem\DatabaseUpdatedLogEntry;
 use App\Services\LogSystem\EventLogger;
-use Doctrine\Common\EventSubscriber;
+use Doctrine\Bundle\DoctrineBundle\Attribute\AsDoctrineListener;
 use Doctrine\Migrations\DependencyFactory;
 use Doctrine\Migrations\Event\MigrationsEventArgs;
 use Doctrine\Migrations\Events;
@@ -32,7 +32,9 @@ use Doctrine\Migrations\Events;
 /**
  * This subscriber logs databaseMigrations to Event log.
  */
-class LogDBMigrationSubscriber implements EventSubscriber
+#[AsDoctrineListener(event: Events::onMigrationsMigrated)]
+#[AsDoctrineListener(event: Events::onMigrationsMigrating)]
+class LogDBMigrationListener
 {
     protected ?string $old_version = null;
     protected ?string $new_version = null;