Merge pull request #65 from mvar/fix_sort

Fix query sort structure

src/Aggregation/TopHitsAggregation.php

@@ -125,15 +125,12 @@ class TopHitsAggregation extends AbstractAggregation
      */
     public function getArray()
     {
-        $output = $this->getSort() ? $this->getSort()->toArray() : [];
         $output = array_filter(
-            array_merge(
-                $output,
-                [
-                    'size' => $this->getSize(),
-                    'from' => $this->getFrom(),
-                ]
-            ),
+            [
+                'sort' => $this->getSort() ? $this->getSort()->toArray() : null,
+                'size' => $this->getSize(),
+                'from' => $this->getFrom(),
+            ],
             function ($val) {
                 return (($val || is_array($val) || ($val || is_numeric($val))));
             }

src/Sort/FieldSort.php

@@ -103,6 +103,6 @@ class FieldSort implements BuilderInterface
             $this->field => empty($fieldValues) ? new \stdClass() : $fieldValues,
         ];
 
-        return [$this->getType() => $output];
+        return $output;
     }
 }

tests/SearchTest.php

@@ -14,6 +14,7 @@ namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL;
 use ONGR\ElasticsearchDSL\Query\MissingQuery;
 use ONGR\ElasticsearchDSL\Query\TermQuery;
 use ONGR\ElasticsearchDSL\Search;
+use ONGR\ElasticsearchDSL\Sort\FieldSort;
 
 /**
  * Test for Search.
@@ -242,6 +243,19 @@ class SearchTest extends \PHPUnit_Framework_TestCase
             (new Search())->addQuery(new TermQuery('foo', 'bar'))->addFilter(new MissingQuery('baz')),
         ];
 
+        $cases['sort_by_price'] = [
+            [
+                'sort' => [
+                    [
+                        'price' => [
+                            'order' => 'asc',
+                        ],
+                    ],
+                ],
+            ],
+            (new Search())->addSort(new FieldSort('price', 'asc')),
+        ];
+
         return $cases;
     }