fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 01:01:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Support custom namespaces in ModuleHandler and related processes

Browse source
This commit is contained in:
Kijin Sung 2023-08-11 21:56:42 +09:00
parent 9e13c5ee6e
commit 7502b7308b
4 changed files with 107 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

36
classes/module/ModuleHandler.class.php
View file

@ -414,7 +414,15 @@ class ModuleHandler extends Handler
// Create an instance of the requested module and class
if($class_name)
{
$class_fullname = sprintf('Rhymix\\Modules\\%s\\%s', $this->module, $class_name);
if (isset($xml_info->namespaces) && count($xml_info->namespaces))
{
$class_fullname = array_first($xml_info->namespaces) . '\\' . $class_name;
}
else
{
$class_fullname = sprintf('Rhymix\\Modules\\%s\\%s', $this->module, $class_name);
}
if (class_exists($class_fullname))
{
$oModule = $class_fullname::getInstance();
@ -442,19 +450,7 @@ class ModuleHandler extends Handler
$oModule = self::getModuleInstance($this->module, $type ?: 'class', $kind);
if (!$oModule)
{
$base_class_fullname = sprintf('Rhymix\\Modules\\%s\\Base', $this->module);
if (class_exists($base_class_fullname))
{
$oModule = $base_class_fullname::getInstance();
}
else
{
$base_class_fullname = sprintf('Rhymix\\Modules\\%s\\Controllers\\Base', $this->module);
if (class_exists($base_class_fullname))
{
$oModule = $base_class_fullname::getInstance();
}
}
$oModule = ModuleModel::getModuleBaseClass($this->module, $xml_info);
}
}
@ -548,7 +544,15 @@ class ModuleHandler extends Handler
if($forward->class_name)
{
$class_fullname = sprintf('Rhymix\\Modules\\%s\\%s', $forward->module, $forward->class_name);
if (isset($xml_info->namespaces) && count($xml_info->namespaces))
{
$class_fullname = array_first($xml_info->namespaces) . '\\' . $forward->class_name;
}
else
{
$class_fullname = sprintf('Rhymix\\Modules\\%s\\%s', $forward->module, $forward->class_name);
}
if (class_exists($class_fullname))
{
$oModule = $class_fullname::getInstance();
@ -1291,7 +1295,7 @@ class ModuleHandler extends Handler
// Get instance of module class
if (strpos($type, '\\') !== false)
{
$class_name = sprintf('Rhymix\\Modules\\%s\\%s', $module, $type);
$class_name = ($type[0] === '\\') ? $type : sprintf('Rhymix\\Modules\\%s\\%s', $module, $type);
if (class_exists($class_name))
{
$oModule = $class_name::getInstance();