From 23b46ac74628a64d93ccfd2bb5d046167207f507 Mon Sep 17 00:00:00 2001
From: David Badura <david.badura@patchlevel.de>
Date: Fri, 9 Jan 2026 10:35:58 +0100
Subject: [PATCH] remove deprecated subscriber util and helper

---
 .../Subscriber/SubscriberHelper.php           | 28 --------------
 .../Subscriber/SubscriberUtil.php             | 38 -------------------
 .../Projection/BatchProfileProjector.php      |  7 ++--
 .../Projection/ProfileProjector.php           |  7 ++--
 .../Subscriber/LookupSubscriber.php           |  7 ++--
 .../Subscriber/ProfileNewProjection.php       |  7 ++--
 .../Subscriber/ProfileProjection.php          |  7 ++--
 .../Subscriber/SubscriberHelperTest.php       | 26 -------------
 8 files changed, 15 insertions(+), 112 deletions(-)
 delete mode 100644 src/Subscription/Subscriber/SubscriberHelper.php
 delete mode 100644 src/Subscription/Subscriber/SubscriberUtil.php
 delete mode 100644 tests/Unit/Subscription/Subscriber/SubscriberHelperTest.php

diff --git a/src/Subscription/Subscriber/SubscriberHelper.php b/src/Subscription/Subscriber/SubscriberHelper.php
deleted file mode 100644
index 733a4ffcc..000000000
--- a/src/Subscription/Subscriber/SubscriberHelper.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Patchlevel\EventSourcing\Subscription\Subscriber;
-
-use Patchlevel\EventSourcing\Metadata\Subscriber\AttributeSubscriberMetadataFactory;
-use Patchlevel\EventSourcing\Metadata\Subscriber\SubscriberMetadata;
-use Patchlevel\EventSourcing\Metadata\Subscriber\SubscriberMetadataFactory;
-
-/** @deprecated since 3.15.0 will be removed with 4.0.0 */
-final class SubscriberHelper
-{
-    public function __construct(
-        private readonly SubscriberMetadataFactory $metadataFactory = new AttributeSubscriberMetadataFactory(),
-    ) {
-    }
-
-    public function subscriberId(object $subscriber): string
-    {
-        return $this->metadata($subscriber)->id;
-    }
-
-    private function metadata(object $subscriber): SubscriberMetadata
-    {
-        return $this->metadataFactory->metadata($subscriber::class);
-    }
-}
diff --git a/src/Subscription/Subscriber/SubscriberUtil.php b/src/Subscription/Subscriber/SubscriberUtil.php
deleted file mode 100644
index 01592494c..000000000
--- a/src/Subscription/Subscriber/SubscriberUtil.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Patchlevel\EventSourcing\Subscription\Subscriber;
-
-use Patchlevel\EventSourcing\Metadata\Subscriber\AttributeSubscriberMetadataFactory;
-use Patchlevel\EventSourcing\Metadata\Subscriber\SubscriberMetadataFactory;
-
-/** @deprecated since 3.15.0 will be removed with 4.0.0 */
-trait SubscriberUtil
-{
-    private static SubscriberMetadataFactory|null $metadataFactory = null;
-
-    public static function setMetadataFactory(SubscriberMetadataFactory $metadataFactory): void
-    {
-        self::$metadataFactory = $metadataFactory;
-    }
-
-    private static function metadataFactory(): SubscriberMetadataFactory
-    {
-        if (self::$metadataFactory === null) {
-            self::$metadataFactory = new AttributeSubscriberMetadataFactory();
-        }
-
-        return self::$metadataFactory;
-    }
-
-    private function subscriberHelper(): SubscriberHelper
-    {
-        return new SubscriberHelper(self::metadataFactory());
-    }
-
-    private function subscriberId(): string
-    {
-        return $this->subscriberHelper()->subscriberId($this);
-    }
-}
diff --git a/tests/Benchmark/BasicImplementation/Projection/BatchProfileProjector.php b/tests/Benchmark/BasicImplementation/Projection/BatchProfileProjector.php
index 8896906f2..3b3cd8b76 100644
--- a/tests/Benchmark/BasicImplementation/Projection/BatchProfileProjector.php
+++ b/tests/Benchmark/BasicImplementation/Projection/BatchProfileProjector.php
@@ -10,14 +10,13 @@
 use Patchlevel\EventSourcing\Attribute\Subscribe;
 use Patchlevel\EventSourcing\Attribute\Teardown;
 use Patchlevel\EventSourcing\Subscription\Subscriber\BatchableSubscriber;
-use Patchlevel\EventSourcing\Subscription\Subscriber\SubscriberUtil;
 use Patchlevel\EventSourcing\Tests\Benchmark\BasicImplementation\Events\NameChanged;
 use Patchlevel\EventSourcing\Tests\Benchmark\BasicImplementation\Events\ProfileCreated;
 
-#[Projector('profile')]
+#[Projector(self::SUBSCRIBER_ID)]
 final class BatchProfileProjector implements BatchableSubscriber
 {
-    use SubscriberUtil;
+    private const SUBSCRIBER_ID = 'profile';
 
     /** @var array<string, string> */
     private array $nameChanged = [];
@@ -59,7 +58,7 @@ public function onNameChanged(NameChanged $nameChanged): void
 
     public function table(): string
     {
-        return 'projection_' . $this->subscriberId();
+        return 'projection_' . self::SUBSCRIBER_ID;
     }
 
     public function beginBatch(): void
diff --git a/tests/Benchmark/BasicImplementation/Projection/ProfileProjector.php b/tests/Benchmark/BasicImplementation/Projection/ProfileProjector.php
index 98f16b3c2..1833dbf2a 100644
--- a/tests/Benchmark/BasicImplementation/Projection/ProfileProjector.php
+++ b/tests/Benchmark/BasicImplementation/Projection/ProfileProjector.php
@@ -10,15 +10,14 @@
 use Patchlevel\EventSourcing\Attribute\Setup;
 use Patchlevel\EventSourcing\Attribute\Subscribe;
 use Patchlevel\EventSourcing\Attribute\Teardown;
-use Patchlevel\EventSourcing\Subscription\Subscriber\SubscriberUtil;
 use Patchlevel\EventSourcing\Tests\Benchmark\BasicImplementation\Events\NameChanged;
 use Patchlevel\EventSourcing\Tests\Benchmark\BasicImplementation\Events\ProfileCreated;
 use Patchlevel\EventSourcing\Tests\Benchmark\BasicImplementation\Query\QueryProfileName;
 
-#[Projector('profile')]
+#[Projector(self::SUBSCRIBER_ID)]
 final class ProfileProjector
 {
-    use SubscriberUtil;
+    private const SUBSCRIBER_ID = 'profile';
 
     public function __construct(
         private Connection $connection,
@@ -70,6 +69,6 @@ public function getProfileName(QueryProfileName $queryProfileName): string
 
     public function table(): string
     {
-        return 'projection_' . $this->subscriberId();
+        return 'projection_' . self::SUBSCRIBER_ID;
     }
 }
diff --git a/tests/Integration/Subscription/Subscriber/LookupSubscriber.php b/tests/Integration/Subscription/Subscriber/LookupSubscriber.php
index 491e65b19..035596c34 100644
--- a/tests/Integration/Subscription/Subscriber/LookupSubscriber.php
+++ b/tests/Integration/Subscription/Subscriber/LookupSubscriber.php
@@ -14,15 +14,14 @@
 use Patchlevel\EventSourcing\Message\Reducer;
 use Patchlevel\EventSourcing\Subscription\Lookup\Lookup;
 use Patchlevel\EventSourcing\Subscription\RunMode;
-use Patchlevel\EventSourcing\Subscription\Subscriber\SubscriberUtil;
 use Patchlevel\EventSourcing\Tests\Integration\Subscription\Events\AdminPromoted;
 use Patchlevel\EventSourcing\Tests\Integration\Subscription\Events\NameChanged;
 use Patchlevel\EventSourcing\Tests\Integration\Subscription\Events\ProfileCreated;
 
-#[Subscriber('lookup', RunMode::FromBeginning)]
+#[Subscriber(self::SUBSCRIBER_ID, RunMode::FromBeginning)]
 final class LookupSubscriber
 {
-    use SubscriberUtil;
+    private const SUBSCRIBER_ID = 'lookup';
 
     public function __construct(
         private Connection $connection,
@@ -78,6 +77,6 @@ public function drop(): void
 
     private function tableName(): string
     {
-        return 'projection_' . $this->subscriberId();
+        return 'projection_' . self::SUBSCRIBER_ID;
     }
 }
diff --git a/tests/Integration/Subscription/Subscriber/ProfileNewProjection.php b/tests/Integration/Subscription/Subscriber/ProfileNewProjection.php
index f2bae566c..a11d1a0a9 100644
--- a/tests/Integration/Subscription/Subscriber/ProfileNewProjection.php
+++ b/tests/Integration/Subscription/Subscriber/ProfileNewProjection.php
@@ -10,13 +10,12 @@
 use Patchlevel\EventSourcing\Attribute\Setup;
 use Patchlevel\EventSourcing\Attribute\Subscribe;
 use Patchlevel\EventSourcing\Attribute\Teardown;
-use Patchlevel\EventSourcing\Subscription\Subscriber\SubscriberUtil;
 use Patchlevel\EventSourcing\Tests\Integration\Subscription\Events\ProfileCreated;
 
-#[Projector('profile_2')]
+#[Projector(self::SUBSCRIBER_ID)]
 final class ProfileNewProjection
 {
-    use SubscriberUtil;
+    private const SUBSCRIBER_ID = 'profile_2';
 
     public function __construct(
         private Connection $connection,
@@ -54,6 +53,6 @@ public function handleProfileCreated(ProfileCreated $profileCreated): void
 
     private function tableName(): string
     {
-        return 'projection_' . $this->subscriberId();
+        return 'projection_' . self::SUBSCRIBER_ID;
     }
 }
diff --git a/tests/Integration/Subscription/Subscriber/ProfileProjection.php b/tests/Integration/Subscription/Subscriber/ProfileProjection.php
index 0ecf43e3e..1ca44af33 100644
--- a/tests/Integration/Subscription/Subscriber/ProfileProjection.php
+++ b/tests/Integration/Subscription/Subscriber/ProfileProjection.php
@@ -11,13 +11,12 @@
 use Patchlevel\EventSourcing\Attribute\Subscribe;
 use Patchlevel\EventSourcing\Attribute\Teardown;
 use Patchlevel\EventSourcing\Subscription\Subscriber\BatchableSubscriber;
-use Patchlevel\EventSourcing\Subscription\Subscriber\SubscriberUtil;
 use Patchlevel\EventSourcing\Tests\Integration\Subscription\Events\ProfileCreated;
 
-#[Projector('profile_1')]
+#[Projector(self::SUBSCRIBER_ID)]
 final class ProfileProjection implements BatchableSubscriber
 {
-    use SubscriberUtil;
+    private const SUBSCRIBER_ID = 'profile_1';
 
     public function __construct(
         private Connection $connection,
@@ -55,7 +54,7 @@ public function handleProfileCreated(ProfileCreated $profileCreated): void
 
     private function tableName(): string
     {
-        return 'projection_' . $this->subscriberId();
+        return 'projection_' . self::SUBSCRIBER_ID;
     }
 
     public function beginBatch(): void
diff --git a/tests/Unit/Subscription/Subscriber/SubscriberHelperTest.php b/tests/Unit/Subscription/Subscriber/SubscriberHelperTest.php
deleted file mode 100644
index 8220e0786..000000000
--- a/tests/Unit/Subscription/Subscriber/SubscriberHelperTest.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Patchlevel\EventSourcing\Tests\Unit\Subscription\Subscriber;
-
-use Patchlevel\EventSourcing\Attribute\Subscriber;
-use Patchlevel\EventSourcing\Subscription\RunMode;
-use Patchlevel\EventSourcing\Subscription\Subscriber\SubscriberHelper;
-use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\TestCase;
-
-#[CoversClass(SubscriberHelper::class)]
-final class SubscriberHelperTest extends TestCase
-{
-    public function testSubscriberId(): void
-    {
-        $subscriber = new #[Subscriber('dummy', RunMode::FromBeginning)]
-        class {
-        };
-
-        $helper = new SubscriberHelper();
-
-        self::assertEquals('dummy', $helper->subscriberId($subscriber));
-    }
-}