From 9b1beab5bd435da62d97ea27a4522b405573a980 Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza Date: Sat, 28 Apr 2018 12:44:42 +0200 Subject: [PATCH 1/2] Fix aggregations use statements and return values --- .../Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php | 3 ++- .../Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php | 1 + app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php index 7924f8039b2c2..bfd56d85b4cb2 100644 --- a/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php +++ b/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php @@ -6,7 +6,7 @@ namespace Magento\Cms\Model\ResourceModel\Block\Grid; use Magento\Framework\Api\Search\SearchResultInterface; -use Magento\Framework\Search\AggregationInterface; +use Magento\Framework\Api\Search\AggregationInterface; use Magento\Cms\Model\ResourceModel\Block\Collection as BlockCollection; /** @@ -82,6 +82,7 @@ public function getAggregations() public function setAggregations($aggregations) { $this->aggregations = $aggregations; + return $this; } /** diff --git a/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php index 01a1f83b83db9..63f5e1c83df46 100644 --- a/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php +++ b/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php @@ -83,6 +83,7 @@ public function getAggregations() public function setAggregations($aggregations) { $this->aggregations = $aggregations; + return $this; } /** diff --git a/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php index e6aafb07a0c87..4bb3e9e277267 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php @@ -6,7 +6,7 @@ namespace Magento\Sales\Model\ResourceModel\Grid; use Magento\Framework\Api\Search\SearchResultInterface; -use Magento\Framework\Search\AggregationInterface; +use Magento\Framework\Api\Search\AggregationInterface; use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection; /** @@ -78,6 +78,7 @@ public function getAggregations() public function setAggregations($aggregations) { $this->aggregations = $aggregations; + return $this; } From 912c06cfe0b03e7efb2b29432bd6a30980ec60f1 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Sat, 28 Apr 2018 16:02:26 +0300 Subject: [PATCH 2/2] Fixed code style issues --- app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php index 4bb3e9e277267..1c7e4f0eec75d 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php @@ -15,7 +15,6 @@ */ class Collection extends AbstractCollection implements SearchResultInterface { - /** * @var AggregationInterface */ @@ -81,7 +80,6 @@ public function setAggregations($aggregations) return $this; } - /** * Retrieve all ids for collection * Backward compatibility with EAV collection