php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-22 17:48:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:yiisoft/yii2

Browse Source
This commit is contained in:
Nobuo Kihara
2014-11-01 22:22:37 +09:00
parent 0bd1d80397 ecb113f1d0
commit 2fe64eea69
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/guide/rest-resources.md
View File

@@ -71,8 +71,8 @@ public function fields()
// field name is "email", the corresponding attribute name is "email_address" // field name is "email", the corresponding attribute name is "email_address"
'email' => 'email_address', 'email' => 'email_address',
// field name is "name", its value is defined by a PHP callback // field name is "name", its value is defined by a PHP callback
'name' => function () { 'name' => function ($model) {
return $this->first_name . ' ' . $this->last_name; return $model->first_name . ' ' . $model->last_name;
}, },
]; ];
} }

4
framework/base/Arrayable.php
View File

@@ -52,8 +52,8 @@ interface Arrayable
* 'email', * 'email',
* 'firstName' => 'first_name', * 'firstName' => 'first_name',
* 'lastName' => 'last_name', * 'lastName' => 'last_name',
* 'fullName' => function () { * 'fullName' => function ($model) {
* return $this->first_name . ' ' . $this->last_name; * return $model->first_name . ' ' . $model->last_name;
* }, * },
* ]; * ];
* ``` * ```

4
framework/base/Model.php
View File

@@ -841,8 +841,8 @@ class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayab
* 'email', * 'email',
* 'firstName' => 'first_name', * 'firstName' => 'first_name',
* 'lastName' => 'last_name', * 'lastName' => 'last_name',
* 'fullName' => function () { * 'fullName' => function ($model) {
* return $this->first_name . ' ' . $this->last_name; * return $model->first_name . ' ' . $model->last_name;
* }, * },
* ]; * ];
* ``` * ```