new updates

This commit is contained in:
Mark Gregory
2026-07-01 11:17:58 +01:00
parent c2ce6d9ccb
commit cd7226cfa5
8 changed files with 124 additions and 26 deletions
+12 -1
View File
@@ -42,6 +42,7 @@ class DatabaseModuleRegistry
['module' => $module->getName()],
[
'enabled' => $module->isEnabled(),
'version' => $this->moduleVersion($module),
'sort_order' => (int) $module->get('order', 0),
]
);
@@ -60,6 +61,7 @@ class DatabaseModuleRegistry
->where('module', $module->getName())
->value('enabled') ?? $module->isEnabled(),
'description' => $data['description'] ?? null,
'version' => $data['version'] ?? null,
'sort_order' => (int) ($data['sort_order'] ?? 0),
]
);
@@ -115,7 +117,9 @@ class DatabaseModuleRegistry
'alias' => $module->getAlias(),
'description' => $status?->description,
'disk_description' => $module->getDescription(),
'version' => $this->moduleVersion($module),
'version' => $this->databaseVersion($status) ?? $this->moduleVersion($module),
'database_version' => $this->databaseVersion($status),
'disk_version' => $this->moduleVersion($module),
'sort_order' => (int) ($status?->sort_order ?? $module->get('order', 0)),
'path' => $module->getPath(),
'requires' => $module->getRequires(),
@@ -125,6 +129,13 @@ class DatabaseModuleRegistry
];
}
protected function databaseVersion(?ModuleStatus $status): ?string
{
$version = $status?->version;
return is_string($version) && trim($version) !== '' ? trim($version) : null;
}
protected function moduleVersion(Module $module): ?string
{
$version = $module->get('version');