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

docs/guide/rest-resources.md

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

framework/base/Arrayable.php

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

framework/base/Model.php

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