fa/breadcrumb-the-shire
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Harden module runtime: audited listener failures and DI-first resolver

Browse Source
This commit is contained in:
Felix Schneider
2026-03-25 10:02:03 +01:00
parent a721ec0043
commit cb5f7037b2
12 changed files with 314 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/Support/SearchConfig.php
View File

@@ -20,10 +20,15 @@ class SearchConfig
/** @var (callable(): ModuleRegistry)|null */
private static $moduleRegistryResolver = null;
/** @var (callable(string): ?object)|null */
private static $moduleClassResolver = null;
public static function configure(callable $moduleRegistryResolver): void
public static function configure(callable $moduleRegistryResolver, ?callable $moduleClassResolver = null): void
{
self::$moduleRegistryResolver = $moduleRegistryResolver;
self::$moduleClassResolver = $moduleClassResolver !== null
? \Closure::fromCallable($moduleClassResolver)
: null;
self::resetModuleProviders();
}
@@ -155,10 +160,7 @@ class SearchConfig
return self::$moduleProviders;
}
foreach ($registry->getSearchResources() as $providerClass) {
if (!class_exists($providerClass)) {
continue;
}
$provider = new $providerClass();
$provider = self::resolveModuleProvider($providerClass);
if ($provider instanceof SearchResourceProvider) {
self::$moduleProviders[] = $provider;
foreach ($provider->resources() as $key => $resource) {
@@ -182,6 +184,31 @@ class SearchConfig
self::$moduleProviderByKey = [];
}
private static function resolveModuleProvider(string $providerClass): ?SearchResourceProvider
{
try {
if (is_callable(self::$moduleClassResolver)) {
$resolved = (self::$moduleClassResolver)($providerClass);
return $resolved instanceof SearchResourceProvider ? $resolved : null;
}
if (!class_exists($providerClass)) {
return null;
}
$reflection = new \ReflectionClass($providerClass);
$constructor = $reflection->getConstructor();
if ($constructor !== null && $constructor->getNumberOfRequiredParameters() > 0) {
return null;
}
$instance = $reflection->newInstance();
return $instance instanceof SearchResourceProvider ? $instance : null;
} catch (\Throwable) {
return null;
}
}
public static function hotkeyPreviewResource(string $query): ?array
{
return SearchSpecialResourceProvider::hotkeyPreviewResource($query);

8
lib/Support/helpers/app.php
View File

@@ -60,7 +60,8 @@ function setAppContainer(\MintyPHP\App\AppContainer $container): void
);
\MintyPHP\Support\SearchConfig::configure(
static fn (): \MintyPHP\App\Module\ModuleRegistry => $container->get(\MintyPHP\App\Module\ModuleRegistry::class)
static fn (): \MintyPHP\App\Module\ModuleRegistry => $container->get(\MintyPHP\App\Module\ModuleRegistry::class),
static fn (string $class): ?object => \MintyPHP\App\Module\ModuleClassResolver::resolve($container, $class)
);
}
@@ -691,10 +692,7 @@ function appBuildLayoutNavContext(array $layoutAuth, array $session, array $quer
}
foreach ($moduleRegistry->getLayoutContextProviders() as $providerClass) {
if (!class_exists($providerClass)) {
continue;
}
$provider = new $providerClass();
$provider = \MintyPHP\App\Module\ModuleClassResolver::resolve($container, $providerClass);
if ($provider instanceof \MintyPHP\App\Module\Contracts\LayoutContextProvider) {
$providerData = $provider->provide($session, $container);
if (!is_array($providerData)) {