remove deprecations in subscriptions

Author: DavidBadura

src/Subscription/Engine/DefaultSubscriptionEngine.php

@@ -16,8 +16,6 @@
 use Patchlevel\EventSourcing\Subscription\Store\SubscriptionStore;
 use Patchlevel\EventSourcing\Subscription\Subscriber\BatchableSubscriber;
 use Patchlevel\EventSourcing\Subscription\Subscriber\MetadataSubscriberAccessor;
-use Patchlevel\EventSourcing\Subscription\Subscriber\RealSubscriberAccessor;
-use Patchlevel\EventSourcing\Subscription\Subscriber\SubscriberAccessor;
 use Patchlevel\EventSourcing\Subscription\Subscriber\SubscriberAccessorRepository;
 use Patchlevel\EventSourcing\Subscription\Subscription;
 use Psr\Log\LoggerInterface;
@@ -875,7 +873,7 @@ private function handleMessage(int $index, Message $message, Subscription $subsc
         return null;
     }
 
-    private function subscriber(string $subscriberId): SubscriberAccessor|null
+    private function subscriber(string $subscriberId): MetadataSubscriberAccessor|null
     {
         return $this->subscriberRepository->get($subscriberId);
     }
@@ -959,18 +957,18 @@ private function discoverNewSubscriptions(): void
 
         foreach ($this->subscriberRepository->all() as $subscriber) {
             foreach ($subscriptions as $subscription) {
-                if ($subscription->id() === $subscriber->id()) {
+                if ($subscription->id() === $subscriber->metadata()->id) {
                     continue 2;
                 }
             }
 
             $subscription = new Subscription(
-                $subscriber->id(),
-                $subscriber->group(),
-                $subscriber->runMode(),
+                $subscriber->metadata()->id,
+                $subscriber->metadata()->group,
+                $subscriber->metadata()->runMode,
             );
 
-            if ($subscriber->setupMethod() === null && $subscriber->runMode() === RunMode::FromNow) {
+            if ($subscriber->setupMethod() === null && $subscriber->metadata()->runMode === RunMode::FromNow) {
                 if ($latestIndex === null) {
                     $latestIndex = $this->messageLoader->lastIndex();
                 }
@@ -984,7 +982,7 @@ private function discoverNewSubscriptions(): void
             $this->logger?->info(
                 sprintf(
                     'Subscription Engine: New Subscriber "%s" was found and added to the subscription store.',
-                    $subscriber->id(),
+                    $subscriber->metadata()->id,
                 ),
             );
         }
@@ -1021,14 +1019,14 @@ private function handleFailed(Subscription $subscription, Throwable $throwable,
 
         $subscriber = $this->subscriber($subscription->id());
 
-        if (!$subscriber instanceof MetadataSubscriberAccessor) {
+        if (!$subscriber) {
             $subscription->failed($throwable);
             $this->subscriptionManager->update($subscription);
 
             return;
         }
 
-        if ($subscriber->realSubscriber() instanceof BatchableSubscriber) {
+        if ($subscriber->subscriber() instanceof BatchableSubscriber) {
             $subscription->failed($throwable);
             $this->subscriptionManager->update($subscription);
 
@@ -1138,11 +1136,11 @@ private function checkAndBeginBatch(Subscription $subscription): Error|null
 
         $subscriber = $this->subscriber($subscription->id());
 
-        if (!$subscriber instanceof RealSubscriberAccessor) {
+        if (!$subscriber) {
             return null;
         }
 
-        $realSubscriber = $subscriber->realSubscriber();
+        $realSubscriber = $subscriber->subscriber();
 
         if (!$realSubscriber instanceof BatchableSubscriber) {
             return null;

src/Subscription/Subscriber/ArgumentResolver/AggregateIdArgumentResolver.php

@@ -9,7 +9,6 @@
 use Patchlevel\EventSourcing\Message\Message;
 use Patchlevel\EventSourcing\Metadata\Subscriber\SubscribeMethodMetadata;
 use Patchlevel\EventSourcing\Metadata\Subscriber\SubscriberMetadata;
-use Patchlevel\EventSourcing\Subscription\RunMode;
 use Patchlevel\EventSourcing\Subscription\Subscriber\ArgumentResolver\ArgumentResolver;
 use Throwable;
 
@@ -18,7 +17,7 @@
 use function array_map;
 
 /** @template T of object */
-final class MetadataSubscriberAccessor implements SubscriberAccessor, RealSubscriberAccessor
+final class MetadataSubscriberAccessor
 {
     /** @var array<class-string, list<Closure(Message):void>> */
     private array $subscribeCache = [];
@@ -45,24 +44,6 @@ public function subscriber(): object
         return $this->subscriber;
     }
 
-    /** @deprecated use `->metadata()->id` instead */
-    public function id(): string
-    {
-        return $this->metadata->id;
-    }
-
-    /** @deprecated use `->metadata()->group` instead */
-    public function group(): string
-    {
-        return $this->metadata->group;
-    }
-
-    /** @deprecated use `->metadata()->runMode` instead */
-    public function runMode(): RunMode
-    {
-        return $this->metadata->runMode;
-    }
-
     public function setupMethod(): Closure|null
     {
         $method = $this->metadata->setupMethod;
@@ -180,14 +161,4 @@ private function resolvers(string $eventClass, SubscribeMethodMetadata $method):
 
         return $resolvers;
     }
-
-    /**
-     * @deprecated use `->metadata()` instead
-     *
-     * @return T
-     */
-    public function realSubscriber(): object
-    {
-        return $this->subscriber;
-    }
 }

src/Subscription/Subscriber/MetadataSubscriberAccessor.php

@@ -6,7 +6,6 @@
 
 use Patchlevel\EventSourcing\Metadata\Subscriber\AttributeSubscriberMetadataFactory;
 use Patchlevel\EventSourcing\Metadata\Subscriber\SubscriberMetadataFactory;
-use Patchlevel\EventSourcing\Subscription\Subscriber\ArgumentResolver\AggregateIdArgumentResolver;
 use Patchlevel\EventSourcing\Subscription\Subscriber\ArgumentResolver\ArgumentResolver;
 use Patchlevel\EventSourcing\Subscription\Subscriber\ArgumentResolver\EventArgumentResolver;
 use Patchlevel\EventSourcing\Subscription\Subscriber\ArgumentResolver\MessageArgumentResolver;
@@ -41,7 +40,6 @@ public function __construct(
             [
                 new MessageArgumentResolver(),
                 new EventArgumentResolver(),
-                new AggregateIdArgumentResolver(),
                 new RecordedOnArgumentResolver(),
             ],
         );

src/Subscription/Subscriber/MetadataSubscriberAccessorRepository.php

@@ -6,8 +6,8 @@
 
 interface SubscriberAccessorRepository
 {
-    /** @return iterable<SubscriberAccessor> */
+    /** @return iterable<MetadataSubscriberAccessor> */
     public function all(): iterable;
 
-    public function get(string $id): SubscriberAccessor|null;
+    public function get(string $id): MetadataSubscriberAccessor|null;
 }

src/Subscription/Subscriber/RealSubscriberAccessor.php

@@ -5,11 +5,13 @@
 namespace Patchlevel\EventSourcing\Tests\Integration\BasicImplementation\Events;
 
 use Patchlevel\EventSourcing\Attribute\Event;
+use Patchlevel\EventSourcing\Tests\Integration\BasicImplementation\ProfileId;
 
 #[Event('profile.name_changed')]
 final class NameChanged
 {
     public function __construct(
+        public ProfileId $profileId,
         public string $name,
     ) {
     }

src/Subscription/Subscriber/SubscriberAccessor.php

@@ -30,7 +30,7 @@ public static function create(ProfileId $id, string $name): self
 
     public function changeName(string $name): void
     {
-        $this->recordThat(new NameChanged($name));
+        $this->recordThat(new NameChanged($this->id, $name));
     }
 
     #[Apply(ProfileCreated::class)]

src/Subscription/Subscriber/SubscriberAccessorRepository.php

@@ -45,7 +45,7 @@ public function changeName(
         #[Inject('env')]
         string $env,
     ): void {
-        $this->recordThat(new NameChanged($command->name));
+        $this->recordThat(new NameChanged($this->id, $command->name));
     }
 
     #[Apply]