Using multi indcies/types to search

.travis.yml

@@ -3,6 +3,7 @@ language: php
 php:
     - 5.5
     - 5.6
+    - 7.0
 
 include:
     - php: 5.5

src/ElasticquentMultiSearch.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace Elasticquent;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ElasticquentMultiSearch extends Model implements ElasticquentInterface
+{
+    use ElasticquentTrait {
+        getBasicEsParams as TraitGetBasicEsParams;
+        getIndexName as TraitGetIndexName;
+    }
+
+    protected $types = [];
+
+    protected $indices = [];
+
+    public function __construct(array $attributes = [])
+    {
+        parent::__construct($attributes);
+
+        // initialize indices
+        $this->indices = [$this->TraitGetIndexName()];
+    }
+
+    /**
+     * Set indcies to search from
+     * @param mixed $indices
+     */
+    public function setIndexName($indices)
+    {
+        $this->indices = $indices;
+        return $this;
+    }
+
+    public function getIndexName()
+    {
+        return $this->indices;
+    }
+
+    /**
+     * Set types to search from
+     * @param mixed $types
+     */
+    public function setTypeName($types)
+    {
+        $this->types = $types;
+        return $this;
+
+    }
+
+    public function getTypeName()
+    {
+        return $this->types;
+    }
+
+    /**
+     * Create a elacticquent result collection of models from plain arrays.
+     *
+     * Use _type to instantiate models
+     *
+     * @param  array  $items
+     * @param  array  $meta
+     * @return \Elasticquent\ElasticquentResultCollection
+     */
+    public static function hydrateElasticquentResult(array $items, $meta = null)
+    {
+        // Cache instances
+        $instances = [];
+
+        $results = [];
+
+        foreach ($items as $item) {
+            $className = $item['_type'];
+            if (!class_exists($className)) {
+                continue;
+            }
+            if (!isset($instances[$className])) {
+                $instances[$className] = new $className;
+            }
+            $results[] = $instances[$className]->newFromHitBuilder($item);
+        }
+
+        return (new static)->newElasticquentResultCollection($results, $meta);
+    }
+}

src/ElasticquentTrait.php

@@ -71,7 +71,7 @@ public function newCollection(array $models = array())
      */
     public function getTypeName()
     {
-        return $this->getTable();
+        return get_class($this);
     }
 
     /**

tests/ElasticSearchMethodsTest.php

@@ -12,9 +12,9 @@
  * specifically returns results consistent with the ElasticSearch PHP client version
  * 2.0 documentation.
  *
- * The Elasticquent method will then format the response and we test that the resulting 
- * Elasticquent results collection methods return the results we expect to verify this. 
- */ 
+ * The Elasticquent method will then format the response and we test that the resulting
+ * Elasticquent results collection methods return the results we expect to verify this.
+ */
 
 class ElasticSearchMethodsTest extends PHPUnit_Framework_TestCase
 {
@@ -24,15 +24,15 @@ class ElasticSearchMethodsTest extends PHPUnit_Framework_TestCase
             'hits' => [
                 [
                     '_index' => 'my_custom_index_name',
-                    '_type' => 'test_table',
+                    '_type' => 'SearchTestModel',
                     '_score' => 0.7768564,
                     '_source' => [
                         'name' => 'foo',
                     ]
                 ],
                 [
                     '_index' => 'my_custom_index_name',
-                    '_type' => 'test_table',
+                    '_type' => 'SearchTestModel',
                     '_score' => 0.5634561,
                     '_source' => [
                         'name' => 'bar',

tests/ElasticquentTraitTest.php

@@ -20,7 +20,7 @@ public function setup()
      */
     public function testTypeNameInferredFromTableName()
     {
-        $this->assertEquals('test_table', $this->model->getTypeName());
+        $this->assertEquals('TestModel', $this->model->getTypeName());
     }
 
     /**

tests/stubs/parameters.php

@@ -8,7 +8,7 @@ function basicParameters()
 {
     return [
         'index' => 'my_custom_index_name',
-        'type' => 'test_table',
+        'type' => 'SearchTestModel',
     ];
 }
 

tests/stubs/results.php

@@ -20,15 +20,15 @@ function successfulResults()
             'hits' => [
                 [
                     '_index' => 'my_custom_index_name',
-                    '_type' => 'test_table',
+                    '_type' => 'SearchTestModel',
                     '_score' => 0.7768564,
                     '_source' => [
                         'name' => 'foo',
                     ]
                 ],
                 [
                     '_index' => 'my_custom_index_name',
-                    '_type' => 'test_table',
+                    '_type' => 'SearchTestModel',
                     '_score' => 0.5634561,
                     '_source' => [
                         'name' => 'bar',