From 84817213b9ae694ad7216df4695f170ec3b50726 Mon Sep 17 00:00:00 2001
From: Robert Alexa <mail@robertalexa.me>
Date: Thu, 8 Dec 2022 20:34:39 +0000
Subject: [PATCH] Fix issue with autoloading modules

---
 modules/system/ServiceProvider.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index 90ca44ae2e..2dc967b27e 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -24,6 +24,7 @@
 use Validator;
 use View;
 use Winter\Storm\Router\Helper as RouterHelper;
+use Winter\Storm\Support\ClassLoader;
 use Winter\Storm\Support\ModuleServiceProvider;
 
 class ServiceProvider extends ModuleServiceProvider
@@ -37,6 +38,14 @@ public function register()
     {
         parent::register();
 
+        $modules = Config::get('cms.loadModules', []);
+        $classLoader = $this->app->make(ClassLoader::class);
+        foreach ($modules as $module) {
+            if (strtolower(trim($module)) != 'system') {
+                $classLoader->autoloadPackage($module . '\\', "modules/" . strtolower($module) . '/');
+            }
+        }
+
         $this->registerSingletons();
         $this->registerPrivilegedActions();
 
@@ -58,7 +67,7 @@ public function register()
         /*
          * Register other module providers
          */
-        foreach (Config::get('cms.loadModules', []) as $module) {
+        foreach ($modules as $module) {
             if (strtolower(trim($module)) != 'system') {
                 $this->app->register('\\' . $module . '\ServiceProvider');
             }