fs
7a222f0b1f
Fix 5 broken FQCN references (runtime errors) where core pages referenced non-existent MintyPHP\Service\Audit\AuditMetadataEnricher and SystemAuditService. Add AuditMetadataEnricherInterface with NullAuditMetadataEnricher fallback so deactivating the audit module no longer crashes core edit pages. Move audit search resources from core Search*Provider files into the module via a new AuditSearchResourceProvider implementing the existing SearchResourceProvider contract. Add module-specific purge permissions (audit.api.purge, audit.imports.purge) replacing core ABILITY_ADMIN_SETTINGS_UPDATE. Also fixes: session key prefix convention, hardcoded English string, $_SERVER superglobal fallback, and manifest schema drift (i18n_path, group in ui_slots). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
92 lines
4.3 KiB
PHP
92 lines
4.3 KiB
PHP
<?php
|
|
|
|
use MintyPHP\App\AppContainer;
|
|
use MintyPHP\App\Container\ContainerRegistrar;
|
|
use MintyPHP\App\Container\Registrars\AccessRegistrar;
|
|
use MintyPHP\App\Container\Registrars\AppServicesRegistrar;
|
|
use MintyPHP\App\Container\Registrars\AuthRegistrar;
|
|
use MintyPHP\App\Container\Registrars\DirectoryRegistrar;
|
|
use MintyPHP\App\Container\Registrars\RepositoryFactoryRegistrar;
|
|
use MintyPHP\App\Container\Registrars\ServiceFactoryRegistrar;
|
|
use MintyPHP\App\Container\Registrars\SettingsRegistrar;
|
|
use MintyPHP\App\Container\Registrars\UserRegistrar;
|
|
use MintyPHP\App\Module\ModuleEventDispatcher;
|
|
use MintyPHP\App\Module\ModuleRegistry;
|
|
use MintyPHP\Service\Audit\AuditMetadataEnricherInterface;
|
|
use MintyPHP\Service\Audit\AuditRecorderInterface;
|
|
use MintyPHP\Service\Audit\ImportAuditInterface;
|
|
use MintyPHP\Service\Audit\NullAuditMetadataEnricher;
|
|
use MintyPHP\Service\Audit\NullAuditRecorder;
|
|
use MintyPHP\Service\Audit\NullImportAudit;
|
|
use MintyPHP\Service\Audit\NullUserLifecycleAudit;
|
|
use MintyPHP\Service\Audit\UserLifecycleAuditInterface;
|
|
|
|
$container = new AppContainer();
|
|
|
|
// Order matters: RepositoryFactoryRegistrar and ServiceFactoryRegistrar must run first
|
|
// because later registrars pull concrete services from those factories.
|
|
$registrars = [
|
|
new RepositoryFactoryRegistrar(), // raw repository factories (no deps)
|
|
new ServiceFactoryRegistrar(), // service factories wired with their repo/gateway deps
|
|
new AccessRegistrar(), // RBAC: permissions, roles, authorization
|
|
new AuthRegistrar(), // authentication, SSO, tokens
|
|
new DirectoryRegistrar(), // tenants, departments, scope
|
|
new UserRegistrar(), // user services and repositories
|
|
new SettingsRegistrar(), // settings, branding
|
|
new AppServicesRegistrar(), // leaf services (stats, search, mail, scheduler, ...)
|
|
];
|
|
|
|
foreach ($registrars as $registrar) {
|
|
$registrar->register($container);
|
|
}
|
|
|
|
// ── Module registrars (run after all Core registrars) ────────────────
|
|
// Module registrars MUST NOT overwrite existing container keys.
|
|
// The ModuleRegistry is stored in the container for downstream access.
|
|
|
|
$modulesConfig = is_file(__DIR__ . '/../../config/modules.php')
|
|
? (array) require __DIR__ . '/../../config/modules.php'
|
|
: [];
|
|
$enabledModules = ModuleRegistry::resolveEnabledModules($modulesConfig);
|
|
$modulesDir = dirname(__DIR__, 2) . '/modules';
|
|
$moduleRegistry = ModuleRegistry::boot($modulesDir, $enabledModules);
|
|
|
|
$container->set(ModuleRegistry::class, static fn (): ModuleRegistry => $moduleRegistry);
|
|
$container->set(ModuleEventDispatcher::class, static fn () => new ModuleEventDispatcher(
|
|
$moduleRegistry->getEventListeners(),
|
|
$container,
|
|
$container->has(AuditRecorderInterface::class) ? $container->get(AuditRecorderInterface::class) : null
|
|
));
|
|
|
|
// Disallow overriding existing core bindings from module registrars.
|
|
$container->protectExistingBindings();
|
|
|
|
foreach ($moduleRegistry->getContainerRegistrars() as $registrarClass) {
|
|
if (!class_exists($registrarClass)) {
|
|
throw new RuntimeException("Module container registrar class not found: {$registrarClass}");
|
|
}
|
|
$registrarInstance = new $registrarClass();
|
|
if (!$registrarInstance instanceof ContainerRegistrar) {
|
|
throw new RuntimeException(
|
|
"Module container registrar '{$registrarClass}' must implement " . ContainerRegistrar::class
|
|
);
|
|
}
|
|
$registrarInstance->register($container);
|
|
}
|
|
|
|
// ── Audit interface fallbacks (null implementations when audit module is disabled) ──
|
|
if (!$container->has(AuditRecorderInterface::class)) {
|
|
$container->set(AuditRecorderInterface::class, static fn (): AuditRecorderInterface => new NullAuditRecorder());
|
|
}
|
|
if (!$container->has(UserLifecycleAuditInterface::class)) {
|
|
$container->set(UserLifecycleAuditInterface::class, static fn (): UserLifecycleAuditInterface => new NullUserLifecycleAudit());
|
|
}
|
|
if (!$container->has(ImportAuditInterface::class)) {
|
|
$container->set(ImportAuditInterface::class, static fn (): ImportAuditInterface => new NullImportAudit());
|
|
}
|
|
if (!$container->has(AuditMetadataEnricherInterface::class)) {
|
|
$container->set(AuditMetadataEnricherInterface::class, static fn (): AuditMetadataEnricherInterface => new NullAuditMetadataEnricher());
|
|
}
|
|
|
|
return $container;
|