Skip to content

[Backport] Fix aggregations use statements and return values #14894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 28, 2018
Merged

[Backport] Fix aggregations use statements and return values #14894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b1beab
Fix aggregations use statements and return values
rogyar Apr 28, 2018
912c06c
Fixed code style issues
Apr 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -82,6 +82,7 @@ public function getAggregations()
public function setAggregations($aggregations)
{
$this->aggregations = $aggregations;
return $this;
}

/**
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ public function getAggregations()
public function setAggregations($aggregations)
{
$this->aggregations = $aggregations;
return $this;
}

/**
Expand Down
5 changes: 2 additions & 3 deletions app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -15,7 +15,6 @@
*/
class Collection extends AbstractCollection implements SearchResultInterface
{

/**
* @var AggregationInterface
*/
Expand Down Expand Up @@ -78,9 +77,9 @@ public function getAggregations()
public function setAggregations($aggregations)
{
$this->aggregations = $aggregations;
return $this;
}


/**
* Retrieve all ids for collection
* Backward compatibility with EAV collection
Expand Down