bit
/
taskman_bhl
25
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improving BHL_REF validation by better splitting code by namespaces
Publish PHP Package / docker (push) Successful in 6s Details

This commit is contained in:
Pavel Shevaev 2025-02-12 17:13:41 +03:00
parent 82ad2216da
commit 22ec477ddf
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bhl.inc.php
View File

@ -267,24 +267,25 @@ function bhl_validate_func_ref(string $module_file, string $func_full_name, arra
if(!$module_src)
throw new Exception("Bad module file '{$module_file}'");
$ns_chunks = _bhl_split_by_namespaces($module_src);
$module_chunks = array();
if($namespace)
{
$ns_chunks = _bhl_split_by_namespaces($module_src);
if(count($ns_chunks) == 0)
throw new Exception("No namespaces found in '$module_file'");
if(!isset($ns_chunks[$namespace]))
throw new Exception("No namespace '$namespace' found in '$module_file'");
foreach($ns_chunks as $ns => $ns_src)
{
if($ns === $namespace)
foreach($ns_chunks[$namespace] as $ns_src)
$module_chunks[] = $ns_src;
}
if(count($module_chunks) == 0)
throw new Exception("Namespace '$namespace' for func '$func_full_name' not found in '$module_file'");
}
else
$module_chunks[] = $module_src;
{
if(!isset($ns_chunks['']))
throw new Exception("No global namespace found in '$module_file'");
foreach($ns_chunks[''] as $ns_src)
$module_chunks[] = $ns_src;
}
$signature_pattern = '';
$signature_pattern .= '~func\s+';
@ -346,12 +347,19 @@ function _bhl_split_by_namespaces(string $src) : array
{
$ns = trim(substr(ltrim($chunk), 9));
$body = $chunks[$i+1];
$nss[$ns] = $body;
if(!isset($nss[$ns]))
$nss[$ns] = array();
$nss[$ns][] = $body;
$i+=2;
}
else
{
if(!isset($nss['']))
$nss[''] = array();
$nss[''][] = $chunk;
++$i;
}
}
return $nss;
}