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

PSR规范调整

Browse Source
This commit is contained in:
thinkphp
2015-10-04 13:05:15 +08:00
parent 1cfb3704c6
commit 27e724bb3c
135 changed files with 9426 additions and 11556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
library/org/transform/driver/json.php
View File

@@ -11,12 +11,15 @@
namespace think\transform\driver;
class Json{
public function encode($data){
return json_encode($data, JSON_UNESCAPED_UNICODE);
}
class Json
{
public function encode($data)
{
return json_encode($data, JSON_UNESCAPED_UNICODE);
}
public function decode($data, $assoc = true){
return json_decode($data, $assoc);
}
public function decode($data, $assoc = true)
{
return json_decode($data, $assoc);
}
}

35
library/org/transform/driver/xml.php
View File

@@ -11,16 +11,17 @@
namespace think\transform\driver;
class Xml{
class Xml
{
/**
* XML数据默认配置项
* @var array
*/
private $config = [
'root_name' => 'think', //根节点名称
'root_attr' => [], //根节点属性
'item_name' => 'item', //数字节点转换的名称
'item_key' => 'id', //数字节点转换的属性名
'root_attr' => [], //根节点属性
'item_name' => 'item', //数字节点转换的名称
'item_key' => 'id', //数字节点转换的属性名
];
/**
@@ -29,7 +30,8 @@ class Xml{
* @param array $config 数据配置项
* @return string 编码后的XML数据
*/
public function encode($data, array $config = []) {
public function encode($data, array $config = [])
{
//初始化配置
$config = array_merge($this->config, $config);
@@ -46,17 +48,18 @@ class Xml{
* @param array $config 数据配置项
* @return string 解码后的XML数据
*/
public function decode($str, $assoc = true, array $config = []){
public function decode($str, $assoc = true, array $config = [])
{
//初始化配置
$config = array_merge($this->config, $config);
//创建XML对象
$xml = new \SimpleXMLElement($str);
if($assoc){
if ($assoc) {
self::xml2data($xml, $data, $config['item_name'], $config['item_key']);
return $data;
}
return $xml;
}
@@ -69,16 +72,17 @@ class Xml{
* @param string $id 数字索引key转换为的属性名
* @return string
*/
static public function data2xml(SimpleXMLElement $xml, $data, $item = 'item', $id = 'id') {
public static function data2xml(SimpleXMLElement $xml, $data, $item = 'item', $id = 'id')
{
foreach ($data as $key => $value) {
//指定默认的数字key
if(is_numeric($key)){
if (is_numeric($key)) {
$id && $val = $key;
$key = $item;
$key = $item;
}
//添加子元素
if(is_array($value) || is_object($value)){
if (is_array($value) || is_object($value)) {
$child = $xml->addChild($key);
self::data2xml($child, $value, $item, $id);
} else {
@@ -99,15 +103,16 @@ class Xml{
* @param string $item 数字索引时的节点名称
* @param string $id 数字索引key转换为的属性名
*/
static public function xml2data(SimpleXMLElement $xml, &$data, $item = 'item', $id = 'id'){
public static function xml2data(SimpleXMLElement $xml, &$data, $item = 'item', $id = 'id')
{
foreach ($xml->children() as $items) {
$key = $items->getName();
$attr = $items->attributes();
if($key == $item && isset($attr[$id])){
if ($key == $item && isset($attr[$id])) {
$key = strval($attr[$id]);
}
if($items->count()){
if ($items->count()) {
self::xml2data($items, $val);
} else {
$val = strval($items);