diff --git a/app/Modules/ModuleServiceProvider.php b/app/Modules/ModuleServiceProvider.php index cd4e5fb..0d3fade 100644 --- a/app/Modules/ModuleServiceProvider.php +++ b/app/Modules/ModuleServiceProvider.php @@ -62,22 +62,14 @@ class ModuleServiceProvider extends ServiceProvider public function verifyModuleComposerRequirements(BaseModule $module): void { foreach ($module->app->getComposerRequirements() as $package) { - if ($package->type === ModulePackageType::PACKAGE) { - if (! InstalledVersions::isInstalled($package->name)) { - abort( - code: 500, - message: "{$package->name} must be installed (module: {$module->name})" - ); - } - } + $missingPackage = match ($package->type) { + ModulePackageType::PACKAGE => InstalledVersions::isInstalled($package->name), + ModulePackageType::MODULE => module_exists($package->name), + default => true, + }; - if ($package->type === ModulePackageType::MODULE) { - if (! module_exists($package->name)) { - abort( - code: 500, - message: "{$package->name} module must be installed (module: {$module->name})" - ); - } + if (! $missingPackage) { + abort(500, "{$package->name} {$package->type} must be installed (module: {$module->name})"); } } }