PSR规范调整

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

View File

@@ -11,12 +11,14 @@
namespace think\config\driver;
class Ini {
public function parse($config){
if(is_file($config)) {
return parse_ini_file($config,true);
}else{
return parse_ini_string($config,true);
class Ini
{
public function parse($config)
{
if (is_file($config)) {
return parse_ini_file($config, true);
} else {
return parse_ini_string($config, true);
}
}
}

View File

@@ -11,17 +11,19 @@
namespace think\config\driver;
class Xml {
public function parse($config){
if(is_file($config)) {
$content = simplexml_load_file($config);
}else{
$content = simplexml_load_string($config);
class Xml
{
public function parse($config)
{
if (is_file($config)) {
$content = simplexml_load_file($config);
} else {
$content = simplexml_load_string($config);
}
$result = (array)$content;
foreach($result as $key=>$val){
if(is_object($val)) {
$result[$key] = (array)$val;
$result = (array) $content;
foreach ($result as $key => $val) {
if (is_object($val)) {
$result[$key] = (array) $val;
}
}
return $result;