Merge pull request #805 from patchlevel/remove-deprecated-subscriper-util-and-helper

remove deprecated subscriber util and helper

Author: DanielBadura

src/Subscription/Subscriber/SubscriberHelper.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

src/Subscription/Subscriber/SubscriberUtil.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;
     }
 }

tests/Benchmark/BasicImplementation/Projection/BatchProfileProjector.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;
     }
 }

tests/Benchmark/BasicImplementation/Projection/ProfileProjector.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;
     }
 }

tests/Integration/Subscription/Subscriber/LookupSubscriber.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