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

Use associative array to store custom namespaces

Browse source
This commit is contained in:
Kijin Sung 2023-08-12 21:53:52 +09:00
parent 911772393a
commit a7954506f6
5 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/module/module.controller.php
View file

@ -1463,20 +1463,20 @@ class ModuleController extends Module
continue;
}
if (!isset($namespaces[$name]))
if (!isset($namespaces['mapping'][$name]))
{
$namespaces[$name] = 'modules/' . $module_name;
$namespaces['mapping'][$name] = 'modules/' . $module_name;
$changed = true;
}
}
// Remove namespaces that are no longer defined by this module.
foreach ($namespaces as $name => $path)
foreach ($namespaces['mapping'] ?? [] as $name => $path)
{
$attached_module = preg_replace('!^modules/!', '', $path);
if ($attached_module === $module_name && !in_array($name, $module_action_info->namespaces ?? []))
{
unset($namespaces[$name]);
unset($namespaces['mapping'][$name]);
$changed = true;
}
}
@ -1484,7 +1484,7 @@ class ModuleController extends Module
// Generate a regular expression for routing.
$regexp = [];
unset($namespaces['regexp']);
foreach ($namespaces as $name => $path)
foreach ($namespaces['mapping'] ?? [] as $name => $path)
{
$regexp[] = preg_quote(strtr($name, '\\', '/'), '!');
}