Let the caller handle the construction of the notification

Author: Bellangelo

examples/09-standalone-cli/index.php

@@ -27,7 +27,7 @@
     $logger
 );
 
-$notificationPublisher = Mcp\Server\NotificationPublisher::make();
+$notificationPublisher = new Mcp\Server\NotificationPublisher();
 
 // Set up the server
 $sever = new Mcp\Server($jsonRpcHandler, $notificationPublisher, $logger);

src/Capability/Registry.php

@@ -101,7 +101,7 @@ public function registerTool(Tool $tool, callable|array|string $handler, bool $i
 
         $this->tools[$toolName] = new ToolReference($tool, $handler, $isManual);
 
-        $this->notificationPublisher->enqueue(ToolListChangedNotification::class);
+        $this->notificationPublisher->enqueue(new ToolListChangedNotification());
     }
 
     /**
@@ -120,7 +120,7 @@ public function registerResource(Resource $resource, callable|array|string $hand
 
         $this->resources[$uri] = new ResourceReference($resource, $handler, $isManual);
 
-        $this->notificationPublisher->enqueue(ResourceListChangedNotification::class);
+        $this->notificationPublisher->enqueue(new ResourceListChangedNotification());
     }
 
     /**
@@ -169,7 +169,7 @@ public function registerPrompt(
 
         $this->prompts[$promptName] = new PromptReference($prompt, $handler, $isManual, $completionProviders);
 
-        $this->notificationPublisher->enqueue(PromptListChangedNotification::class);
+        $this->notificationPublisher->enqueue(new PromptListChangedNotification());
     }
 
     /**

src/Server/NotificationPublisher.php

@@ -13,7 +13,6 @@
 
 namespace Mcp\Server;
 
-use Mcp\JsonRpc\MessageFactory;
 use Mcp\Schema\JsonRpc\Notification;
 
 /**
@@ -24,23 +23,8 @@ class NotificationPublisher
     /** @var list<Notification> */
     private array $queue = [];
 
-    public function __construct(
-        private readonly MessageFactory $factory,
-    ) {
-    }
-
-    public static function make(): self
-    {
-        return new self(MessageFactory::make());
-    }
-
-    /**
-     * @param class-string<Notification> $notificationType
-     */
-    public function enqueue(string $notificationType): void
+    public function enqueue(Notification $notification): void
     {
-        $notification = $this->factory->createByType($notificationType, []);
-
         $this->queue[] = $notification;
     }
 

src/Server/ServerBuilder.php

@@ -208,7 +208,7 @@ public function withPrompt(callable|array|string $handler, ?string $name = null,
     public function build(): Server
     {
         $logger = $this->logger ?? new NullLogger();
-        $notificationPublisher = NotificationPublisher::make();
+        $notificationPublisher = new NotificationPublisher();
         $container = $this->container ?? new Container();
         $registry = new Registry($notificationPublisher, new ReferenceHandler($container), $logger);
 

tests/Capability/Discovery/DiscoveryTest.php

@@ -35,7 +35,7 @@ class DiscoveryTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->registry = new Registry(NotificationPublisher::make());
+        $this->registry = new Registry(new NotificationPublisher());
         $this->discoverer = new Discoverer($this->registry);
     }
 

tests/Capability/RegistryTest.php

@@ -47,7 +47,7 @@ public function testToolRegistration(): void
         $notificationPublisher = $this->createMock(NotificationPublisher::class);
         $notificationPublisher->expects($this->once())
             ->method('enqueue')
-            ->with(ToolListChangedNotification::class);
+            ->with(new ToolListChangedNotification());
 
         $registry = new Registry($notificationPublisher);
         $registry->registerTool($tool, fn () => null);
@@ -67,7 +67,7 @@ public function testResourceRegistration(): void
         $notificationPublisher = $this->createMock(NotificationPublisher::class);
         $notificationPublisher->expects($this->once())
             ->method('enqueue')
-            ->with(ResourceListChangedNotification::class);
+            ->with(new ResourceListChangedNotification());
 
         $registry = new Registry($notificationPublisher);
         $registry->registerResource($resource, fn () => null);
@@ -86,7 +86,7 @@ public function testPromptRegistration(): void
         $notificationPublisher = $this->createMock(NotificationPublisher::class);
         $notificationPublisher->expects($this->once())
             ->method('enqueue')
-            ->with(PromptListChangedNotification::class);
+            ->with(new PromptListChangedNotification());
 
         $registry = new Registry($notificationPublisher);
         $registry->registerPrompt($prompt, fn () => null);

tests/Server/NotificationPublisherTest.php

@@ -28,11 +28,11 @@ class NotificationPublisherTest extends TestCase
     public function testEnqueue(): void
     {
         $expectedNotifications = [
-            ToolListChangedNotification::class,
-            ResourceListChangedNotification::class,
-            PromptListChangedNotification::class,
+            new ToolListChangedNotification(),
+            new ResourceListChangedNotification(),
+            new PromptListChangedNotification(),
         ];
-        $notificationPublisher = new NotificationPublisher(MessageFactory::make());
+        $notificationPublisher = new NotificationPublisher();
 
         foreach ($expectedNotifications as $notificationType) {
             $notificationPublisher->enqueue($notificationType);
@@ -43,7 +43,7 @@ public function testEnqueue(): void
         $this->assertCount(\count($expectedNotifications), $flushedNotifications);
 
         foreach ($flushedNotifications as $index => $notification) {
-            $this->assertInstanceOf($expectedNotifications[$index], $notification);
+            $this->assertSame($expectedNotifications[$index], $notification);
         }
 
         $this->assertEmpty(iterator_to_array($notificationPublisher->flush()));