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;
class Auto {
class Auto
{
protected $auto = [];
protected $auto = [];
public function rule($rule){
$this->auto = $rule;
public function rule($rule)
{
$this->auto = $rule;
return $this;
}
@@ -26,32 +28,38 @@ class Auto {
* @param array $data 创建数据
* @return mixed
*/
public function operate($data) {
public function operate($data)
{
// 自动填充
if($this->auto) {
foreach ($this->auto as $auto){
if ($this->auto) {
foreach ($this->auto as $auto) {
// 填充因子定义格式
// array('field','填充内容','附加规则',[额外参数])
switch(trim($auto[2])) {
switch (trim($auto[2])) {
case 'callback': // 使用回调方法
$args = isset($auto[3])?(array)$auto[3]:[];
if(isset($data[$auto[0]])) {
array_unshift($args,$data[$auto[0]]);
$args = isset($auto[3]) ? (array) $auto[3] : [];
if (isset($data[$auto[0]])) {
array_unshift($args, $data[$auto[0]]);
}
$data[$auto[0]] = call_user_func_array($auto[1], $args);
$data[$auto[0]] = call_user_func_array($auto[1], $args);
break;
case 'field': // 用其它字段的值进行填充
case 'field': // 用其它字段的值进行填充
$data[$auto[0]] = $data[$auto[1]];
break;
case 'ignore': // 为空忽略
if(''===$data[$auto[0]])
if ('' === $data[$auto[0]]) {
unset($data[$auto[0]]);
}
break;
case 'string':
default: // 默认作为字符串填充
$data[$auto[0]] = $auto[1];
}
if(false === $data[$auto[0]] ) unset($data[$auto[0]]);
if (false === $data[$auto[0]]) {
unset($data[$auto[0]]);
}
}
}
return $data;