Skip to content

Fix ServerBuilder error handling for manual element registration #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 25, 2025
Merged

Fix ServerBuilder error handling for manual element registration #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions src/ServerBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
use PhpMcp\Server\Contracts\SessionHandlerInterface;
use PhpMcp\Server\Defaults\BasicContainer;
use PhpMcp\Server\Exception\ConfigurationException;
use PhpMcp\Server\Exception\DefinitionException;

use PhpMcp\Server\Session\ArraySessionHandler;
use PhpMcp\Server\Session\CacheSessionHandler;
use PhpMcp\Server\Session\SessionManager;
Expand Down Expand Up @@ -286,7 +286,6 @@ private function registerManualElements(Registry $registry, LoggerInterface $log
return;
}

$errorCount = 0;
$docBlockParser = new Utils\DocBlockParser($logger);
$schemaGenerator = new Utils\SchemaGenerator($docBlockParser);

Expand All @@ -308,8 +307,8 @@ private function registerManualElements(Registry $registry, LoggerInterface $log

$logger->debug("Registered manual tool {$name} from handler {$className}::{$methodName}");
} catch (Throwable $e) {
$errorCount++;
$logger->error('Failed to register manual tool', ['handler' => $data['handler'], 'name' => $data['name'], 'exception' => $e]);
throw new ConfigurationException("Error registering manual tool '{$data['name']}': {$e->getMessage()}", 0, $e);
}
}

Expand All @@ -334,8 +333,8 @@ private function registerManualElements(Registry $registry, LoggerInterface $log

$logger->debug("Registered manual resource {$name} from handler {$className}::{$methodName}");
} catch (Throwable $e) {
$errorCount++;
$logger->error('Failed to register manual resource', ['handler' => $data['handler'], 'uri' => $data['uri'], 'exception' => $e]);
throw new ConfigurationException("Error registering manual resource '{$data['uri']}': {$e->getMessage()}", 0, $e);
}
}

Expand All @@ -360,8 +359,8 @@ private function registerManualElements(Registry $registry, LoggerInterface $log

$logger->debug("Registered manual template {$name} from handler {$className}::{$methodName}");
} catch (Throwable $e) {
$errorCount++;
$logger->error('Failed to register manual template', ['handler' => $data['handler'], 'uriTemplate' => $data['uriTemplate'], 'exception' => $e]);
throw new ConfigurationException("Error registering manual resource template '{$data['uriTemplate']}': {$e->getMessage()}", 0, $e);
}
}

Expand Down Expand Up @@ -401,15 +400,11 @@ private function registerManualElements(Registry $registry, LoggerInterface $log

$logger->debug("Registered manual prompt {$name} from handler {$className}::{$methodName}");
} catch (Throwable $e) {
$errorCount++;
$logger->error('Failed to register manual prompt', ['handler' => $data['handler'], 'name' => $data['name'], 'exception' => $e]);
throw new ConfigurationException("Error registering manual prompt '{$data['name']}': {$e->getMessage()}", 0, $e);
}
}

if ($errorCount > 0) {
throw new DefinitionException("{$errorCount} error(s) occurred during manual element registration. Check logs.");
}

$logger->debug('Manual element registration complete.');
}

Expand Down