From 40ffcb21c31302e3cae355e413351fbda30ac673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simonas=20=C5=A0erlinskas?= <simonas.serlinskas@nfq.com>
Date: Wed, 5 Aug 2015 11:51:22 +0200
Subject: [PATCH] fixing merge conflicts for top hits agg
---
src/Aggregation/TopHitsAggregation.php | 14 +++++++-------
tests/Aggregation/TopHitsAggregationTest.php | 19 -------------------
2 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/src/Aggregation/TopHitsAggregation.php b/src/Aggregation/TopHitsAggregation.php
index 0212be3..d41e3d8 100644
--- a/src/Aggregation/TopHitsAggregation.php
+++ b/src/Aggregation/TopHitsAggregation.php
@@ -12,7 +12,7 @@
namespace ONGR\ElasticsearchDSL\Aggregation;
use ONGR\ElasticsearchDSL\Aggregation\Type\MetricTrait;
-use ONGR\ElasticsearchDSL\Sort\Sorts;
+use ONGR\ElasticsearchDSL\BuilderInterface;
/**
* Top hits aggregation.
@@ -32,7 +32,7 @@ class TopHitsAggregation extends AbstractAggregation
private $from;
/**
- * @var Sorts How the top matching hits should be sorted.
+ * @var BuilderInterface How the top matching hits should be sorted.
*/
private $sort;
@@ -42,7 +42,7 @@ class TopHitsAggregation extends AbstractAggregation
* @param string $name Aggregation name.
* @param null|int $size Number of top matching hits to return per bucket.
* @param null|int $from The offset from the first result you want to fetch.
- * @param null|Sorts $sort How the top matching hits should be sorted.
+ * @param null|BuilderInterface $sort How the top matching hits should be sorted.
*/
public function __construct($name, $size = null, $from = null, $sort = null)
{
@@ -75,7 +75,7 @@ class TopHitsAggregation extends AbstractAggregation
/**
* Return sort.
*
- * @return Sorts
+ * @return BuilderInterface
*/
public function getSort()
{
@@ -85,7 +85,7 @@ class TopHitsAggregation extends AbstractAggregation
/**
* Set sort.
*
- * @param Sorts $sort
+ * @param BuilderInterface $sort
*/
public function setSort($sort)
{
@@ -142,7 +142,7 @@ class TopHitsAggregation extends AbstractAggregation
*/
private function getFilteredData()
{
- $fd = array_filter(
+ $output = array_filter(
[
'sort' => $this->getSort() ? $this->getSort()->toArray() : [],
'size' => $this->getSize(),
@@ -153,6 +153,6 @@ class TopHitsAggregation extends AbstractAggregation
}
);
- return $this->processArray($fd);
+ return $output;
}
}
diff --git a/tests/Aggregation/TopHitsAggregationTest.php b/tests/Aggregation/TopHitsAggregationTest.php
index fa2e91f..cd63b50 100644
--- a/tests/Aggregation/TopHitsAggregationTest.php
+++ b/tests/Aggregation/TopHitsAggregationTest.php
@@ -40,23 +40,4 @@ class TopHitsAggregationTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $aggregation->toArray());
}
-
- /**
- * Tests if adding parameters has any effect.
- */
- public function testParameters()
- {
- $topHitsAggregation = new TopHitsAggregation('test');
- $topHitsAggregation->addParameter('_source', ['include' => ['title']]);
- $expectedAgg = new \stdClass();
- $expectedAgg->sort = [];
- $expectedAgg->_source = ['include' => ['title']];
- $expected = [
- 'agg_test' => [
- 'top_hits' => $expectedAgg,
- ],
- ];
-
- $this->assertEquals($expected, $topHitsAggregation->toArray());
- }
}
--
GitLab