From cc8578e047f5c4777665b931035ea9b35a2d9951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Wed, 18 Oct 2023 12:13:01 +0200
Subject: [PATCH] Task: Remove deprecations

---
 config/services.yaml                               | 13 -------------
 ...tySubscriber.php => BlamableEntityListener.php} | 14 ++++----------
 src/EventListener/DeleteUploadListener.php         |  3 +++
 ...scriber.php => TimestampableEntityListener.php} | 14 ++++----------
 4 files changed, 11 insertions(+), 33 deletions(-)
 rename src/EventListener/{BlamableEntitySubscriber.php => BlamableEntityListener.php} (87%)
 rename src/EventListener/{TimestampableEntitySubscriber.php => TimestampableEntityListener.php} (76%)

diff --git a/config/services.yaml b/config/services.yaml
index 8d46b37..7072355 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -27,14 +27,6 @@ services:
             - name: liip_imagine.cache.resolver
               resolver: format_extension
 
-    App\EventListener\BlamableEntitySubscriber:
-        tags:
-            - { name: 'doctrine.event_subscriber', connection: 'default' }
-
-    App\EventListener\TimestampableEntitySubscriber:
-        tags:
-            - { name: 'doctrine.event_subscriber', connection: 'default' }
-
     App\EventListener\LogoutListener:
         tags:
             - name: kernel.event_listener
@@ -97,11 +89,6 @@ services:
               event: oneup_uploader.validation
               method: onValidate
 
-    App\EventListener\DeleteUploadListener:
-        tags:
-            - name: doctrine.event_listener
-              event: preRemove
-
     app.upload_namer:
         class: App\Service\Upload\UploadNamer
         public: true
diff --git a/src/EventListener/BlamableEntitySubscriber.php b/src/EventListener/BlamableEntityListener.php
similarity index 87%
rename from src/EventListener/BlamableEntitySubscriber.php
rename to src/EventListener/BlamableEntityListener.php
index 96d6b9d..76fc034 100644
--- a/src/EventListener/BlamableEntitySubscriber.php
+++ b/src/EventListener/BlamableEntityListener.php
@@ -3,14 +3,16 @@
 namespace App\EventListener;
 
 use App\Entity\BlameableEntityInterface;
-use Doctrine\Common\EventSubscriber;
+use Doctrine\Bundle\DoctrineBundle\Attribute\AsDoctrineListener;
 use Doctrine\ORM\Event\PrePersistEventArgs;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 use Doctrine\ORM\Events;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Security\Core\User\UserInterface;
 
-class BlamableEntitySubscriber implements EventSubscriber
+#[AsDoctrineListener(event: Events::prePersist)]
+#[AsDoctrineListener(event: Events::preUpdate)]
+class BlamableEntityListener
 {
     /**
      * Properties that are ignored when determining
@@ -26,14 +28,6 @@ class BlamableEntitySubscriber implements EventSubscriber
     public function __construct(private readonly Security $security)
     {}
 
-    public function getSubscribedEvents(): array
-    {
-        return [
-            Events::prePersist,
-            Events::preUpdate,
-        ];
-    }
-
     public function prePersist(PrePersistEventArgs $args): void
     {
         $entity = $args->getObject();
diff --git a/src/EventListener/DeleteUploadListener.php b/src/EventListener/DeleteUploadListener.php
index bb0533a..64e7d58 100644
--- a/src/EventListener/DeleteUploadListener.php
+++ b/src/EventListener/DeleteUploadListener.php
@@ -4,9 +4,12 @@ namespace App\EventListener;
 
 use App\Entity\Upload;
 use App\Service\Upload\UploadHandler;
+use Doctrine\Bundle\DoctrineBundle\Attribute\AsDoctrineListener;
 use Doctrine\ORM\Event\PreRemoveEventArgs;
+use Doctrine\ORM\Events;
 use Liip\ImagineBundle\Imagine\Cache\CacheManager;
 
+#[AsDoctrineListener(event: Events::preRemove)]
 class DeleteUploadListener
 {
     public function __construct(
diff --git a/src/EventListener/TimestampableEntitySubscriber.php b/src/EventListener/TimestampableEntityListener.php
similarity index 76%
rename from src/EventListener/TimestampableEntitySubscriber.php
rename to src/EventListener/TimestampableEntityListener.php
index 08b14f8..0bb5a98 100644
--- a/src/EventListener/TimestampableEntitySubscriber.php
+++ b/src/EventListener/TimestampableEntityListener.php
@@ -3,21 +3,15 @@
 namespace App\EventListener;
 
 use App\Entity\TimestampableEntityInterface;
-use Doctrine\Common\EventSubscriber;
+use Doctrine\Bundle\DoctrineBundle\Attribute\AsDoctrineListener;
 use Doctrine\ORM\Event\PrePersistEventArgs;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 use Doctrine\ORM\Events;
 
-class TimestampableEntitySubscriber implements EventSubscriber
+#[AsDoctrineListener(event: Events::prePersist)]
+#[AsDoctrineListener(event: Events::preUpdate)]
+class TimestampableEntityListener
 {
-    public function getSubscribedEvents(): array
-    {
-        return [
-            Events::prePersist,
-            Events::preUpdate,
-        ];
-    }
-
     public function prePersist(PrePersistEventArgs $args): void
     {
         $entity = $args->getObject();