dataprovider included

Author: tuyakhov

src/Serializer.php

@@ -242,15 +242,16 @@ protected function serializeDataProvider($dataProvider)
  if ($this->request->getIsHead()) {
  return null;
  } else {
- $models = [];
+ $models = $dataProvider->getModels();
+ $data = [];
 
- foreach ($dataProvider->getModels() as $model) {
+ foreach ($models as $model) {
  if ($model instanceof ResourceInterface) {
- $models[] = $this->serializeModel($model);
+ $data[] = $this->serializeModel($model);
  }
  }
 
- $result = ['data' => $models];
+ $result = ['data' => $data];
 
  $included = $this->serializeIncluded($models);
  if (!empty($included)) {

tests/SerializerTest.php

@@ -185,6 +185,26 @@ public function testIncludedDuplicates()
  $includedModel
  ]
  ], $serializer->serialize($model));
+ $this->assertSame([
+ 'data' => [$compoundModel],
+ 'included' => [
+ $includedModel
+ ],
+ 'links' => [
+ 'self' => ['href' => '/index.php?r=&include=extra-field1%2Cextra-field2&page=1']
+ ],
+ 'meta' => [
+ 'total-count' => 1,
+ 'page-count' => 1,
+ 'current-page' => 1,
+ 'per-page' => 20
+ ]
+ ], $serializer->serialize(new ArrayDataProvider([
+ 'allModels' => [$model],
+ 'pagination' => [
+ 'route' => '/',
+ ],
+ ])));
  }
 
  public function dataProviderSerializeDataProvider()