modelcontextprotocol/php-sdk
Watch
1
0
Fork
You've already forked php-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Discoverer file processing for PHAR (#94)

Browse source
This commit is contained in:
ineersa 2025-10-07 21:56:10 -04:00 • committed by GitHub
commit 415f8dd360
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/Capability/Discovery/Discoverer.php
View file

@ -143,16 +143,9 @@ class Discoverer
*/ */
private function processFile(SplFileInfo $file, array &$discoveredCount, array &$tools, array &$resources, array &$prompts, array &$resourceTemplates): void private function processFile(SplFileInfo $file, array &$discoveredCount, array &$tools, array &$resources, array &$prompts, array &$resourceTemplates): void
{ {
$filePath = $file->getRealPath(); $className = $this->getClassFromFile($file);
if (false === $filePath) {
$this->logger->warning('Could not get real path for file', ['path' => $file->getPathname()]);
return;
}
$className = $this->getClassFromFile($filePath);
if (!$className) { if (!$className) {
$this->logger->warning('No valid class found in file', ['file' => $filePath]); $this->logger->warning('No valid class found in file', ['file' => $file->getPathname()]);
return; return;
} }
@ -199,10 +192,10 @@ class Discoverer
} }
} }
} catch (\ReflectionException $e) { } catch (\ReflectionException $e) {
$this->logger->error('Reflection error processing file for MCP discovery', ['file' => $filePath, 'class' => $className, 'exception' => $e->getMessage()]); $this->logger->error('Reflection error processing file for MCP discovery', ['file' => $file->getPathname(), 'class' => $className, 'exception' => $e->getMessage()]);
} catch (\Throwable $e) { } catch (\Throwable $e) {
$this->logger->error('Unexpected error processing file for MCP discovery', [ $this->logger->error('Unexpected error processing file for MCP discovery', [
'file' => $filePath, 'file' => $file->getPathname(),
'class' => $className, 'class' => $className,
'exception' => $e->getMessage(), 'exception' => $e->getMessage(),
'trace' => $e->getTraceAsString(), 'trace' => $e->getTraceAsString(),
@ -329,34 +322,34 @@ class Discoverer
* Attempt to determine the FQCN from a PHP file path. * Attempt to determine the FQCN from a PHP file path.
* Uses tokenization to extract namespace and class name. * Uses tokenization to extract namespace and class name.
* *
* @param string $filePath absolute path to the PHP file
*
* @return class-string|null the FQCN or null if not found/determinable * @return class-string|null the FQCN or null if not found/determinable
*/ */
private function getClassFromFile(string $filePath): ?string private function getClassFromFile(SplFileInfo $file): ?string
{ {
if (!file_exists($filePath) || !is_readable($filePath)) { $this->logger->debug('Processing file', ['path' => $file->getPathname()]);
$this->logger->warning('File does not exist or is not readable.', ['file' => $filePath]);
try {
$content = $file->getContents();
} catch (\Throwable $e) {
$this->logger->warning("Failed to read file content during class discovery: {$file->getPathname()}", [
'exception' => $e->getMessage(),
]);
return null;
}
if (\strlen($content) > 500 * 1024) {
$this->logger->warning('Skipping large file during class discovery.', ['file' => $file->getPathname()]);
return null; return null;
} }
try { try {
$content = file_get_contents($filePath);
if (false === $content) {
$this->logger->warning('Failed to read file content.', ['file' => $filePath]);
return null;
}
if (\strlen($content) > 500 * 1024) {
$this->logger->debug('Skipping large file during class discovery.', ['file' => $filePath]);
return null;
}
$tokens = token_get_all($content); $tokens = token_get_all($content);
} catch (\Throwable $e) { } catch (\Throwable $e) {
$this->logger->warning("Failed to read or tokenize file during class discovery: {$filePath}", ['exception' => $e->getMessage()]); $this->logger->warning("Failed to tokenize file during class discovery: {$file->getPathname()}", [
'exception' => $e->getMessage(),
]);
return null; return null;
} }
@ -427,7 +420,7 @@ class Discoverer
if (!empty($potentialClasses)) { if (!empty($potentialClasses)) {
if (!class_exists($potentialClasses[0], false)) { if (!class_exists($potentialClasses[0], false)) {
$this->logger->debug('getClassFromFile returning potential non-class type. Are you sure this class has been autoloaded?', ['file' => $filePath, 'type' => $potentialClasses[0]]); $this->logger->debug('getClassFromFile returning potential non-class type. Are you sure this class has been autoloaded?', ['file' => $file->getPathname(), 'type' => $potentialClasses[0]]);
} }
return $potentialClasses[0]; return $potentialClasses[0];