mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 20:52:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

调整 __callStatic 中的逻辑错误

Browse Source
This commit is contained in:
麦当苗儿
2013-04-20 12:47:50 +08:00
parent 1b3f366a59
commit 939c3fdfde
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Library/Think/Transform.php
View File

@@ -22,7 +22,7 @@ class Transform {
* @param string $type 驱动类型
*/
static private function init($type){
if(!isset(self::$handler[$type])) {
if(!isset(self::$handler[$type])) {
$class = '\\Think\\Transform\\Driver\\' . ucwords($type);
self::$handler[$type] = new $class();
}
@@ -34,11 +34,12 @@ class Transform {
* @access public
* @param mixed $content 要编码的数据
* @param string $type 数据类型
* @param array $config XML配置参数，JSON格式生成无此参数
* @return string 编码后的数据
*/
static public function encode($content, $type){
static public function encode($content, $type, array $config = []){
self::init($type);
return self::$handler[$type]->encode($content);
return self::$handler[$type]->encode($content, $config);
}
/**
@@ -46,23 +47,31 @@ class Transform {
* @param string $content 要解码的数据
* @param string $type 数据类型
* @param boolean $assoc 是否返回数组
* @param array $config XML配置参数，JSON格式解码无此参数
* @return mixed 解码后的数据
*/
static public function decode($content, $type, $assoc = true){
self::init($type);
return self::$handler[$type]->decode($content, $assoc);
static public function decode($content, $type, $assoc = true, array $config = []){
self::init($type);
return self::$handler[$type]->decode($content, $assoc, $config);
}
// 调用驱动类的方法
// Transform::xmlEncode('abc')
// Transform::jsonDecode('abc', true);
static public function __callStatic($method, $params){
$type = substr($method, 0, strlen($method) - 6);
$method = strtolower(substr($method, -6));
$assoc = empty($params[2]) ? true : false;
if(!in_array($method, ['encode', 'decode'])){
throw new Think\Exception("call to undefined method {$method}");
static public function __callStatic($method, $params){
$type = substr($method, 0, strlen($method) - 6);
$method = strtolower(substr($method, -6));
switch ($method) {
case 'encode':
$config = empty($params[1]) ? [] : $params[1];
return self::encode($params[0], $type, $config);
case 'decode':
$assoc = empty($params[1]) ? true : $params[1];
$config = empty($params[2]) ? [] : $params[2];
return self::decode($params[0], $type, $assoc, $config);
default:
throw new Exception("call to undefined method {$method}");
}
return self::$method($params[0], $type, $assoc);
}
}
}