Remove fields, extraFields method

Author: tuyakhov

src/ResourceTrait.php

@@ -7,8 +7,6 @@
 
 use yii\base\Arrayable;
 use yii\db\ActiveRecordInterface;
-use yii\db\BaseActiveRecord;
-use yii\helpers\ArrayHelper;
 use yii\helpers\Inflector;
 
 trait ResourceTrait
@@ -41,8 +39,14 @@ public function getType()
     public function getResourceAttributes(array $fields = [])
     {
         $attributes = [];
+        if ($this instanceof Arrayable) {
+            $fieldDefinitions = $this->fields();
+        } else {
+            $vars = array_keys(\Yii::getObjectVars($this));
+            $fieldDefinitions = array_combine($vars, $vars);
+        }
 
-        foreach ($this->resolveFields($this->fields(), $fields) as $name => $definition) {
+        foreach ($this->resolveFields($fieldDefinitions, $fields) as $name => $definition) {
             $attributes[$name] = is_string($definition) ? $this->$definition : call_user_func($definition, $this, $name);
         }
         return $attributes;
@@ -54,8 +58,12 @@ public function getResourceAttributes(array $fields = [])
     public function getResourceRelationships()
     {
         $relationships = [];
+        $fields = [];
+        if ($this instanceof Arrayable) {
+            $fields = $this->extraFields();
+        }
 
-        foreach ($this->resolveFields($this->extraFields()) as $name => $definition) {
+        foreach ($this->resolveFields($fields) as $name => $definition) {
             $relationships[$name] = is_string($definition) ? $this->$definition : call_user_func($definition, $this, $name);
         }
         return $relationships;
@@ -77,23 +85,6 @@ public function setResourceRelationship($name, $relationship)
         }
     }
 
-    /**
-     * @return array
-     */
-    public function fields()
-    {
-        $fields = array_keys(\Yii::getObjectVars($this));
-        return array_combine($fields, $fields);
-    }
-
-    /**
-     * @return array
-     */
-    public function extraFields()
-    {
-        return [];
-    }
-
     /**
      * @param array $fields
      * @param array $fieldSet

tests/SerializerTest.php

@@ -138,10 +138,16 @@ public function dataProviderSerializeDataProvider()
     {
         $bob = new ResourceModel();
         $bob->username = 'Bob';
-        $expectedBob = ['id' => '123', 'type' => 'resource-models', 'attributes' => ['username' => 'Bob']];
+        $bob->extraField1 = new ResourceModel();
+        $expectedBob = ['id' => '123', 'type' => 'resource-models', 
+            'attributes' => ['username' => 'Bob'], 
+            'relationships' => ['extraField1' => ['data' => ['id' => '123', 'type' => 'resource-models']]]];
         $tom = new ResourceModel();
         $tom->username = 'Tom';
-        $expectedTom = ['id' => '123', 'type' => 'resource-models', 'attributes' => ['username' => 'Tom']];
+        $tom->extraField1 = new ResourceModel();
+        $expectedTom = ['id' => '123', 'type' => 'resource-models', 
+            'attributes' => ['username' => 'Tom'], 
+            'relationships' => ['extraField1' => ['data' => ['id' => '123', 'type' => 'resource-models']]]];
         return [
             [
                 new ArrayDataProvider([
@@ -253,6 +259,7 @@ public function dataProviderSerializeDataProvider()
     public function testSerializeDataProvider($dataProvider, $expectedResult)
     {
         $serializer = new Serializer();
+        ResourceModel::$extraFields = ['extraField1'];
         ResourceModel::$fields = ['username'];
         $this->assertEquals($expectedResult, $serializer->serialize($dataProvider));
     }