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

add clearer exception

Browse Source
This commit is contained in:
sunxyw
2022-08-22 16:29:27 +08:00
parent 74af1516ac
commit 32534c870d
3 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ZM/Config/RefactoredConfig.php
View File

@@ -22,22 +22,22 @@ class RefactoredConfig
/** /**
* @var array 已加载的配置文件 * @var array 已加载的配置文件
*/ */
private $loaded_files = []; private array $loaded_files = [];
/** /**
* @var array 配置文件路径 * @var array 配置文件路径
*/ */
private $config_paths; private array $config_paths;
/** /**
* @var string 当前环境 * @var string 当前环境
*/ */
private $environment; private string $environment;
/** /**
* @var Config 内部配置容器 * @var Config 内部配置容器
*/ */
private $holder; private Config $holder;
/** /**
* 构造配置实例 * 构造配置实例
@@ -256,7 +256,7 @@ class RefactoredConfig
// 判断文件格式是否支持 // 判断文件格式是否支持
[$group, $ext, $load_type, $env] = $this->getFileMeta($path); [$group, $ext, $load_type, $env] = $this->getFileMeta($path);
if (!in_array($ext, self::ALLOWED_FILE_EXTENSIONS, true)) { if (!in_array($ext, self::ALLOWED_FILE_EXTENSIONS, true)) {
throw new ConfigException('E00079', "不支持的配置文件格式：{$ext}"); throw ConfigException::unsupportedFileType($path);
} }
// 读取并解析配置 // 读取并解析配置
@@ -267,7 +267,11 @@ class RefactoredConfig
$config = require $path; $config = require $path;
break; break;
case 'json': case 'json':
$config = json_decode($content, true); try {
$config = json_decode($content, true, 512, JSON_THROW_ON_ERROR);
} catch (\JsonException $e) {
throw ConfigException::loadConfigFailed($path, $e->getMessage());
}
break; break;
case 'yaml': case 'yaml':
case 'yml': case 'yml':
@@ -277,7 +281,7 @@ class RefactoredConfig
// TODO: 实现toml解析 // TODO: 实现toml解析
break; break;
default: default:
throw new ConfigException('E00079', "不支持的配置文件格式：{$ext}"); throw ConfigException::unsupportedFileType($path);
} }
// 加入配置 // 加入配置

14
src/ZM/Exception/ConfigException.php
View File

@@ -8,8 +8,22 @@ use Throwable;
class ConfigException extends ZMException class ConfigException extends ZMException
{ {
public const UNSUPPORTED_FILE_TYPE = 'E00079';
public const LOAD_CONFIG_FAILED = 'E00080';
public function __construct($err_code, $message = '', $code = 0, Throwable $previous = null) public function __construct($err_code, $message = '', $code = 0, Throwable $previous = null)
{ {
parent::__construct(zm_internal_errcode($err_code) . $message, $code, $previous); parent::__construct(zm_internal_errcode($err_code) . $message, $code, $previous);
} }
public static function unsupportedFileType(string $file_path): ConfigException
{
return new self(self::UNSUPPORTED_FILE_TYPE, "不支持的配置文件类型：{$file_path}");
}
public static function loadConfigFailed(string $file_path, string $message): ConfigException
{
return new self(self::LOAD_CONFIG_FAILED, "加载配置文件失败：{$file_path}，{$message}");
}
} }

2
tests/ZM/Config/RefactoredConfigTest.php
View File

@@ -13,7 +13,7 @@ use ZM\Utils\ReflectionUtil;
*/ */
class RefactoredConfigTest extends TestCase class RefactoredConfigTest extends TestCase
{ {
private static $config; private static RefactoredConfig $config;
public static function setUpBeforeClass(): void public static function setUpBeforeClass(): void
{ {