modular composer requirements aborts if missing
This commit is contained in:
@@ -62,22 +62,14 @@ class ModuleServiceProvider extends ServiceProvider
|
|||||||
public function verifyModuleComposerRequirements(BaseModule $module): void
|
public function verifyModuleComposerRequirements(BaseModule $module): void
|
||||||
{
|
{
|
||||||
foreach ($module->app->getComposerRequirements() as $package) {
|
foreach ($module->app->getComposerRequirements() as $package) {
|
||||||
if ($package->type === ModulePackageType::PACKAGE) {
|
$missingPackage = match ($package->type) {
|
||||||
if (! InstalledVersions::isInstalled($package->name)) {
|
ModulePackageType::PACKAGE => InstalledVersions::isInstalled($package->name),
|
||||||
abort(
|
ModulePackageType::MODULE => module_exists($package->name),
|
||||||
code: 500,
|
default => true,
|
||||||
message: "{$package->name} must be installed (module: {$module->name})"
|
};
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($package->type === ModulePackageType::MODULE) {
|
if (! $missingPackage) {
|
||||||
if (! module_exists($package->name)) {
|
abort(500, "{$package->name} {$package->type} must be installed (module: {$module->name})");
|
||||||
abort(
|
|
||||||
code: 500,
|
|
||||||
message: "{$package->name} module must be installed (module: {$module->name})"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user