v3.0.2

bumping to php 5.6.6 (Earliest version that can support php elasticsearch) (ErickTamayo#48)
`within` now is being taken into account when specified ErickTamayo#31
Now if the record is not found on the db will not throw undefined offset ErickTamayo#36
Implemented orderBy ErickTamayo#46

.travis.yml

@@ -1,10 +1,15 @@
 language: php
 php:
   - 7.0
-  - 5.6
+  - 5.6.6
 
 before_script:
+  - sleep 10
   - travis_retry composer self-update
   - travis_retry composer install --prefer-source --no-interaction --dev
 
-script: vendor/phpunit/phpunit/phpunit --verbose
+script: vendor/phpunit/phpunit/phpunit --verbose
+
+services:
+  - elasticsearch
+

src/ElasticsearchEngine.php

@@ -127,7 +127,7 @@ protected function performSearch(Builder $builder, array $options = [])
     {
         $params = [
             'index' => $this->index,
-            'type' => $builder->model->searchableAs(),
+            'type' => $builder->index ?: $builder->model->searchableAs(),
             'body' => [
                 'query' => [
                     'bool' => [
@@ -137,6 +137,10 @@ protected function performSearch(Builder $builder, array $options = [])
             ]
         ];
 
+        if ($sort = $this->sort($builder)) {
+            $params['body']['sort'] = $sort;
+        }
+
         if (isset($options['from'])) {
             $params['body']['from'] = $options['from'];
         }
@@ -198,8 +202,8 @@ public function map($results, $model)
         )->get()->keyBy($model->getKeyName());
 
         return collect($results['hits']['hits'])->map(function ($hit) use ($model, $models) {
-            return $models[$hit['_id']];
-        });
+            return isset($models[$hit['_id']]) ? $models[$hit['_id']] : null;
+        })->filter();
     }
 
     /**
@@ -212,4 +216,21 @@ public function getTotalCount($results)
     {
         return $results['hits']['total'];
     }
+
+    /**
+     * Generates the sort if theres any.
+     *
+     * @param  Builder $builder
+     * @return array|null
+     */
+    protected function sort($builder)
+    {
+        if (count($builder->orders) == 0) {
+            return null;
+        }
+
+        return collect($builder->orders)->map(function($order) {
+            return [$order['column'] => $order['direction']];
+        })->toArray();
+    }
 }

tests/ElasticsearchEngineTest.php

@@ -66,13 +66,17 @@ public function test_search_sends_correct_parameters_to_elasticsearch()
                             ['match_phrase' => ['foo' => 1]]
                         ]
                     ]
+                ],
+                'sort' => [
+                    ['id' => 'desc']
                 ]
             ]
         ]);
 
         $engine = new ElasticsearchEngine($client, 'scout');
         $builder = new Laravel\Scout\Builder(new ElasticsearchEngineTestModel, 'zonda');
         $builder->where('foo', 1);
+        $builder->orderBy('id', 'desc');
         $engine->search($builder);
     }