Resolved conflict

Author: Adebayo120

examples/stdio-discovery-calculator/McpElements.php

@@ -32,17 +32,18 @@ final class McpElements
 
     public function __construct(
         private readonly LoggerInterface $logger = new NullLogger(),
-    ) {}
+    ) {
+    }
 
     /**
      * Performs a calculation based on the operation.
      *
      * Supports 'add', 'subtract', 'multiply', 'divide'.
      * Obeys the 'precision' and 'allow_negative' settings from the config resource.
      *
-     * @param float     $a         the first operand
-     * @param float     $b         the second operand
-     * @param string    $operation the operation ('add', 'subtract', 'multiply', 'divide')
+     * @param float        $a         the first operand
+     * @param float        $b         the second operand
+     * @param string       $operation the operation ('add', 'subtract', 'multiply', 'divide')
      * @param ClientLogger $logger    Auto-injected MCP logger
      *
      * @return float|string the result of the calculation, or an error message string
@@ -130,8 +131,8 @@ public function getConfiguration(ClientLogger $logger): array
      * Updates a specific configuration setting.
      * Note: This requires more robust validation in a real app.
      *
-     * @param string    $setting the setting key ('precision' or 'allow_negative')
-     * @param mixed     $value   the new value (int for precision, bool for allow_negative)
+     * @param string       $setting the setting key ('precision' or 'allow_negative')
+     * @param mixed        $value   the new value (int for precision, bool for allow_negative)
      * @param ClientLogger $logger  Auto-injected MCP logger
      *
      * @return array{
@@ -195,6 +196,6 @@ public function updateSetting(string $setting, mixed $value, ClientLogger $logge
         ]);
 
         // $registry->notifyResourceChanged('config://calculator/settings');
-        return ['success' => true, 'message' => 'Allow negative results set to ' . ($value ? 'true' : 'false') . '.'];
+        return ['success' => true, 'message' => 'Allow negative results set to '.($value ? 'true' : 'false').'.'];
     }
 }

examples/stdio-discovery-calculator/server.php

@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-require_once dirname(__DIR__) . '/bootstrap.php';
+require_once dirname(__DIR__).'/bootstrap.php';
 chdir(__DIR__);
 
 use Mcp\Server;

examples/stdio-logging-showcase/LoggingShowcaseHandlers.php

@@ -25,8 +25,8 @@ final class LoggingShowcaseHandlers
     /**
      * Tool that demonstrates different logging levels with auto-injected ClientLogger.
      *
-     * @param string    $message The message to log
-     * @param string    $level   The logging level (debug, info, warning, error)
+     * @param string       $message The message to log
+     * @param string       $level   The logging level (debug, info, warning, error)
      * @param ClientLogger $logger  Auto-injected MCP logger
      *
      * @return array<string, mixed>

examples/stdio-logging-showcase/server.php

@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-require_once dirname(__DIR__) . '/bootstrap.php';
+require_once dirname(__DIR__).'/bootstrap.php';
 chdir(__DIR__);
 
 use Mcp\Server;

src/Server.php

@@ -12,8 +12,8 @@
 namespace Mcp;
 
 use Mcp\Server\Builder;
-use Mcp\Server\Protocol;
 use Mcp\Server\NotificationSender;
+use Mcp\Server\Protocol;
 use Mcp\Server\Transport\TransportInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;

src/Server/Builder.php

@@ -38,8 +38,8 @@
 use Mcp\Schema\ToolAnnotations;
 use Mcp\Server;
 use Mcp\Server\Handler\Notification\NotificationHandlerInterface;
-use Mcp\Server\Handler\Request\RequestHandlerInterface;
 use Mcp\Server\Handler\NotificationHandler;
+use Mcp\Server\Handler\Request\RequestHandlerInterface;
 use Mcp\Server\Handler\Request\SetLogLevelHandler;
 use Mcp\Server\Session\InMemorySessionStore;
 use Mcp\Server\Session\SessionFactory;

src/Server/Handler/JsonRpcHandler.php

@@ -12,11 +12,10 @@
 namespace Mcp\Server\Handler\Request;
 
 use Mcp\Capability\Registry\ReferenceRegistryInterface;
-use Mcp\Schema\JsonRpc\HasMethodInterface;
+use Mcp\Schema\JsonRpc\Request;
 use Mcp\Schema\JsonRpc\Response;
 use Mcp\Schema\Request\SetLogLevelRequest;
 use Mcp\Schema\Result\EmptyResult;
-use Mcp\Server\Handler\MethodHandlerInterface;
 use Mcp\Server\Session\SessionInterface;
 use Psr\Log\LoggerInterface;
 
@@ -28,20 +27,20 @@
  *
  * @author Adam Jamiu <jamiuadam120@gmail.com>
  */
-final class SetLogLevelHandler implements MethodHandlerInterface
+final class SetLogLevelHandler implements RequestHandlerInterface
 {
     public function __construct(
         private readonly ReferenceRegistryInterface $registry,
         private readonly LoggerInterface $logger,
     ) {
     }
 
-    public function supports(HasMethodInterface $message): bool
+    public function supports(Request $message): bool
     {
         return $message instanceof SetLogLevelRequest;
     }
 
-    public function handle(SetLogLevelRequest|HasMethodInterface $message, SessionInterface $session): Response
+    public function handle(Request $message, SessionInterface $session): Response
     {
         \assert($message instanceof SetLogLevelRequest);
 

src/Server/Handler/Request/SetLogLevelHandler.php

@@ -416,8 +416,8 @@ public function parameterSchemaInferredType(
     /**
      * Method with ClientLogger that should be excluded from schema.
      *
-     * @param string $message The message to process
-     * @param \Mcp\Capability\Logger\ClientLogger $logger Auto-injected logger
+     * @param string                              $message The message to process
+     * @param \Mcp\Capability\Logger\ClientLogger $logger  Auto-injected logger
      */
     public function withClientLogger(string $message, \Mcp\Capability\Logger\ClientLogger $logger): string
     {