Skip to content

Commit 5112cfb

Browse files
author
Oleksii Korshenko
authored
MAGETWO-69666: Return array of pages as items instead of array of arrays #9823
2 parents bb98ac1 + 02172bd commit 5112cfb

File tree

2 files changed

+2
-31
lines changed

2 files changed

+2
-31
lines changed

app/code/Magento/Cms/Model/PageRepository.php

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -157,25 +157,10 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $criteria
157157

158158
$this->collectionProcessor->process($criteria, $collection);
159159

160-
$pages = [];
161-
/** @var Page $pageModel */
162-
foreach ($collection as $pageModel) {
163-
$pageData = $this->dataPageFactory->create();
164-
$this->dataObjectHelper->populateWithArray(
165-
$pageData,
166-
$pageModel->getData(),
167-
\Magento\Cms\Api\Data\PageInterface::class
168-
);
169-
$pages[] = $this->dataObjectProcessor->buildOutputDataArray(
170-
$pageData,
171-
\Magento\Cms\Api\Data\PageInterface::class
172-
);
173-
}
174-
175160
/** @var Data\PageSearchResultsInterface $searchResults */
176161
$searchResults = $this->searchResultsFactory->create();
177162
$searchResults->setSearchCriteria($criteria);
178-
$searchResults->setItems($pages);
163+
$searchResults->setItems($collection->getItems());
179164
$searchResults->setTotalCount($collection->getSize());
180165
return $searchResults;
181166
}

app/code/Magento/Cms/Test/Unit/Model/PageRepositoryTest.php

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -261,22 +261,8 @@ public function testGetList()
261261
->willReturnSelf();
262262
$this->pageSearchResult->expects($this->once())
263263
->method('setItems')
264-
->with(['someData'])
264+
->with([$this->page])
265265
->willReturnSelf();
266-
267-
$this->page->expects($this->once())
268-
->method('getData')
269-
->willReturn(['data']);
270-
271-
$this->dataHelper->expects($this->once())
272-
->method('populateWithArray')
273-
->with($this->pageData, ['data'], \Magento\Cms\Api\Data\PageInterface::class);
274-
275-
$this->dataObjectProcessor->expects($this->once())
276-
->method('buildOutputDataArray')
277-
->with($this->pageData, \Magento\Cms\Api\Data\PageInterface::class)
278-
->willReturn('someData');
279-
280266
$this->assertEquals($this->pageSearchResult, $this->repository->getList($criteria));
281267
}
282268
}

0 commit comments

Comments
 (0)