Skip to content

Commit 755993f

Browse files
committed
switch to a const default instead of nullable with a check in the function to convert null to a default
1 parent 2ddea1b commit 755993f

5 files changed

Lines changed: 13 additions & 12 deletions

File tree

src/Capability/Discovery/CachedDiscoverer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public function __construct(
4141
* @param string $basePath the base path for resolving directories
4242
* @param array<string> $directories list of directories (relative to base path) to scan
4343
* @param array<string> $excludeDirs list of directories (relative to base path) to exclude from the scan
44-
* @param array<string>|null $namePatterns list of file name patterns for the scan. Compatible with Finder->name()
44+
* @param array<string> $namePatterns list of file name patterns for the scan. Compatible with Finder->name()
4545
*/
46-
public function discover(string $basePath, array $directories, array $excludeDirs = [], ?array $namePatterns = ['*.php']): DiscoveryState
46+
public function discover(string $basePath, array $directories, array $excludeDirs = [], array $namePatterns = self::DEFAULT_NAME_PATERNS): DiscoveryState
4747
{
4848
$cacheKey = $this->generateCacheKey($basePath, $directories, $excludeDirs);
4949

src/Capability/Discovery/Discoverer.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ public function __construct(
6868
* @param string $basePath the base path for resolving directories
6969
* @param array<string> $directories list of directories (relative to base path) to scan
7070
* @param array<string> $excludeDirs list of directories (relative to base path) to exclude from the scan
71-
* @param array<string>|null $namePatterns list of file name patterns for the scan. Compatible with Finder->name()
71+
* @param array<string> $namePatterns list of file name patterns for the scan. Compatible with Finder->name()
7272
*/
73-
public function discover(string $basePath, array $directories, array $excludeDirs = [], ?array $namePatterns = null): DiscoveryState
73+
public function discover(string $basePath, array $directories, array $excludeDirs = [], array $namePatterns = self::DEFAULT_NAME_PATERNS): DiscoveryState
7474
{
7575
$startTime = microtime(true);
7676
$discoveredCount = [
@@ -85,8 +85,6 @@ public function discover(string $basePath, array $directories, array $excludeDir
8585
$prompts = [];
8686
$resourceTemplates = [];
8787

88-
$namePatterns = !empty($namePatterns) ? $namePatterns : ['*.php'];
89-
9088
try {
9189
$finder = new Finder();
9290
$absolutePaths = [];

src/Capability/Discovery/DiscovererInterface.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,16 @@
2020
*/
2121
interface DiscovererInterface
2222
{
23+
24+
public const DEFAULT_NAME_PATERNS = ['*.php'];
25+
2326
/**
2427
* Discover MCP elements in the specified directories and return the discovery state.
2528
*
2629
* @param string $basePath the base path for resolving directories
2730
* @param array<string> $directories list of directories (relative to base path) to scan
2831
* @param array<string> $excludeDirs list of directories (relative to base path) to exclude from the scan
29-
* @param array<string>|null $namePatterns list of file name patterns for the scan. Compatible with Finder->name()
32+
* @param array<string> $namePatterns list of file name patterns for the scan. Compatible with Finder->name()
3033
*/
31-
public function discover(string $basePath, array $directories, array $excludeDirs = [], ?array $namePatterns = null): DiscoveryState;
34+
public function discover(string $basePath, array $directories, array $excludeDirs = [], array $namePatterns = self::DEFAULT_NAME_PATERNS): DiscoveryState;
3235
}

src/Capability/Registry/Loader/DiscoveryLoader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ final class DiscoveryLoader implements LoaderInterface
2424
/**
2525
* @param string[] $scanDirs
2626
* @param array|string[] $excludeDirs
27-
* @param string[]|null $namePatterns
27+
* @param string[] $namePatterns
2828
*/
2929
public function __construct(
3030
private string $basePath,
3131
private array $scanDirs,
3232
private array $excludeDirs,
3333
private DiscovererInterface $discoverer,
34-
private ?array $namePatterns = null,
34+
private array $namePatterns = DiscovererInterface::DEFAULT_NAME_PATERNS,
3535
) {
3636
}
3737

src/Server/Builder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,14 +353,14 @@ public function setSession(
353353
/**
354354
* @param string[] $scanDirs
355355
* @param string[] $excludeDirs
356-
* @param string[]|null $namePatterns
356+
* @param string[] $namePatterns
357357
*/
358358
public function setDiscovery(
359359
string $basePath,
360360
array $scanDirs = ['.', 'src'],
361361
array $excludeDirs = [],
362362
?CacheInterface $cache = null,
363-
?array $namePatterns = null,
363+
array $namePatterns = DiscovererInterface::DEFAULT_NAME_PATERNS,
364364
): self {
365365
$this->discoveryBasePath = $basePath;
366366
$this->discoveryScanDirs = $scanDirs;

0 commit comments

Comments
 (0)