zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-20 15:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix some DataProvider bug.

Browse Source
This commit is contained in:
whale
2020-05-06 17:19:59 +08:00
parent 181f6430a4
commit 9b3a2e5296
8 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Framework/global_functions.php
View File

@@ -5,7 +5,7 @@ use Framework\DataProvider;
use Framework\ZMBuf;
use ZM\Context\ContextInterface;
function isPharMode(){
function isPharMode() {
return substr(__DIR__, 0, 7) == 'phar://';
}
@@ -162,7 +162,8 @@ function matchArgs($pattern, $context) {
function set_coroutine_params($array) {
$cid = Co::getCid();
if ($cid == -1) die("Cannot set coroutine params at none coroutine mode.");
ZMBuf::$context[$cid] = $array;
if(isset(ZMBuf::$context[$cid])) ZMBuf::$context[$cid] = array_merge(ZMBuf::$context[$cid], $array);
else ZMBuf::$context[$cid] = $array;
foreach (ZMBuf::$context as $c => $v) {
if (!Co::exists($c)) unset(ZMBuf::$context[$c]);
}
@@ -175,16 +176,18 @@ function context() {
$cid = Co::getCid();
$c_class = ZMBuf::globals("context_class");
if (isset(ZMBuf::$context[$cid])) {
return new $c_class(ZMBuf::$context[$cid], $cid);
return new $c_class($cid);
} else {
while (($pcid = Co::getPcid($cid)) !== -1) {
if (isset(ZMBuf::$context[$cid])) return new $c_class(ZMBuf::$context[$cid], $cid);
if (isset(ZMBuf::$context[$cid])) return new $c_class($cid);
else $cid = $pcid;
}
return null;
}
}
function ctx() { return context(); }
function debug($msg) {
if (ZMBuf::$atomics["info_level"]->get() >= 4)
Console::log(date("[H:i:s] ") . "[D] " . $msg, 'gray');