Fixing empty modules

This commit is contained in:
Dennis Eichhorn 2016-11-07 22:29:35 +01:00
parent 968d4823b5
commit e3ac43df34

View File

@ -16,6 +16,7 @@
namespace phpOMS\Module; namespace phpOMS\Module;
use phpOMS\ApplicationAbstract; use phpOMS\ApplicationAbstract;
use phpOMS\Autoloader;
/** /**
* ModuleFactory class. * ModuleFactory class.
@ -74,9 +75,11 @@ class ModuleFactory
*/ */
public static function getInstance(string $module, ApplicationAbstract $app) : ModuleAbstract public static function getInstance(string $module, ApplicationAbstract $app) : ModuleAbstract
{ {
if (!isset(self::$loaded[$module])) {
try {
$class = '\\Modules\\' . $module . '\\Controller'; $class = '\\Modules\\' . $module . '\\Controller';
if (!isset(self::$loaded[$module])) {
if(Autoloader::exists($class) !== false) {
try {
$obj = new $class($app); $obj = new $class($app);
self::$loaded[$module] = $obj; self::$loaded[$module] = $obj;
self::registerRequesting($obj); self::registerRequesting($obj);
@ -84,6 +87,9 @@ class ModuleFactory
} catch (\Exception $e) { } catch (\Exception $e) {
self::$loaded[$module] = new NullModule($app); self::$loaded[$module] = new NullModule($app);
} }
} else {
self::$loaded[$module] = new NullModule($app);
}
} }
return self::$loaded[$module]; return self::$loaded[$module];