Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Support load common yaml files.

Browse Source
This commit is contained in:
Guanxiying
2023-05-23 10:27:16 +08:00
parent 02453b6d11
commit 34cf70ccc7
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/lib/yaml.class.php
+15 -8
View File
@@ -261,16 +261,21 @@ class yaml
/**
* Yaml configuration file for script。
*
* @param string $fileName
* @param string $fileName
* @param bool $useCommon
* @access public
* @return object
* @return object $this
*/
public function config($fileName)
public function config($fileName, $useCommon = false)
{
$runFileName = '';
if(str_contains($fileName, '/')) list($runFileName, $fileName) = explode('/', $fileName);
if($useCommon)
{
$yamlFile = dirname($runPath, 2) . DS . 'yaml' . DS . "{$fileName}.yaml";
if(is_file($yamlFile)) $this->configFiles[] = $yamlFile;
return $this;
}
if($runFileName == '') $runFileName = str_replace(strrchr($_SERVER['SCRIPT_FILENAME'], "."), "", $_SERVER['SCRIPT_FILENAME']);
$runFileName = str_replace(strrchr($_SERVER['SCRIPT_FILENAME'], "."), "", $_SERVER['SCRIPT_FILENAME']);
$pos = strripos($runFileName, DS);
if($pos !== false) $runFileName = mb_substr($runFileName, $pos+1);
@@ -278,8 +283,10 @@ class yaml
$backtrace = debug_backtrace();
$runPath = $backtrace[count($backtrace)-1]['file'];
$yamlFile = dirname($runPath) . "/yaml/$runFileName/{$fileName}.yaml";
if(!is_file($yamlFile)) $yamlFile = dirname($runPath) . "/yaml/common/{$fileName}.yaml";
$yamlFile = dirname($runPath) . DS . 'yaml' . DS . $runFileName . DS . "{$fileName}.yaml";
/* Try to load common yaml file if yaml file not found in $runFileName path.*/
if(!is_file($yamlFile)) $yamlFile = dirname($runPath, 2) . DS . 'yaml' . DS . "{$fileName}.yaml";
if(is_file($yamlFile)) $this->configFiles[] = dirname($runPath) . "/yaml/$runFileName/{$fileName}.yaml";