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

fix ZMRequestTest wrong assertion

Browse Source
This commit is contained in:
sunxyw
2022-12-31 20:22:55 +08:00
parent a62e950870
commit 3f26648a3c
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ZM/Config/ZMConfig.php
View File

@@ -58,20 +58,22 @@ class ZMConfig
*/
private ?ConfigTracer $tracer = null;
/** @var LoaderInterface 配置加载器 */
/**
* @var LoaderInterface 配置加载器
* @phpstan-ignore-next-line We will use this property in the future.
*/
private LoaderInterface $loader;
/**
* 构造配置实例
*
* @param array $config_paths 配置文件路径
* @param string $environment 环境
* @param string $environment 环境
*
* @throws ConfigException 配置文件加载出错
*/
public function __construct(string $environment = 'uninitiated')
public function __construct(string $environment = 'uninitiated', array $init_config = null)
{
$conf = $this->loadInitConfig();
$conf = $init_config ?: $this->loadInitConfig();
$this->file_extensions = $conf['source']['extensions'];
$this->config_paths = $conf['source']['paths'];