add scan and scroll queries

Author: basemkhirat

readme.md

@@ -40,11 +40,7 @@
 
     ES::index("my_index")->create(function($index){
             
-<<<<<<< HEAD
         $index->shards(5)->replicas(1)->mappping([
-=======
-        $index->shards(5)->replicas(1)->mapping([
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
             'my_type' => [
                 'properties' => [
                     'first_name' => [
@@ -63,11 +59,7 @@
 
     ES::create("my_index", function($index){
       
-<<<<<<< HEAD
           $index->shards(5)->replicas(1)->mappping([
-=======
-          $index->shards(5)->replicas(1)->mapping([
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
               'my_type' => [
                   'properties' => [
                       'first_name' => [
@@ -190,11 +182,7 @@ Index and type names setted in query will override values the configuration file
 
 ##### Where not field exists
 
-<<<<<<< HEAD
     ES::whereNot("hobbies", "exists", true)->get(); or ES::whereExists("hobbies", true)->get();
-=======
-    ES::whereNot("hobbies", "exists", true)->get(); or ES::whereExists("hobbies", false)->get();
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
 
 ##### Where not in clause
 
@@ -228,7 +216,6 @@ Index and type names setted in query will override values the configuration file
 
     ES::search("bar")->count();
 
-<<<<<<< HEAD
 
 ##### Scan-and-Scroll queries
 
@@ -258,8 +245,6 @@ Index and type names setted in query will override values the configuration file
     ES::scrollID("DnF1ZXJ5VGhlbkZldGNoBQAAAAAAAAFMFlJQOEtTdnJIUklhcU1FX2VqS0EwZncAAAAAAAABSxZSUDhLU3ZySFJJYXFNRV9laktBMGZ3AAAAAAAAAU4WUlA4S1N2ckhSSWFxTUVfZWpLQTBmdwAAAAAAAAFPFlJQOEtTdnJIUklhcU1FX2VqS0EwZncAAAAAAAABTRZSUDhLU3ZySFJJYXFNRV9laktBMGZ3")
         ->clear();
 
-=======
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
   >
     
 ##### Paginate results with per_page = 5
@@ -273,16 +258,13 @@ Index and type names setted in query will override values the configuration file
 
   >
   
-<<<<<<< HEAD
 ##### Ignoring bad HTTP response
       
     $documents = ES::ignore(404, 500)->_id(5)->first();
 
 
   >
   
-=======
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
 ##### Executing elasticsearch raw queries
 
     ES::raw()->search([
@@ -413,8 +395,4 @@ Index and type names setted in query will override values the configuration file
 
 `Good luck`
 
-<<<<<<< HEAD
-`Dont forget to send a feedback..`
-=======
-`Dont forget to send a feedback..`
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
+`Dont forget to send a feedback..`

src/Index.php

@@ -94,7 +94,6 @@ public function replicas($replicas)
     }
 
     /**
-<<<<<<< HEAD
      * Ignore bad HTTP requests
      * @param array|int $code
      * @return $this
@@ -121,8 +120,6 @@ public function ignore($code)
     }
 
     /**
-=======
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * Create a new index
      * @return mixed
      */

src/Query.php

@@ -2,13 +2,8 @@
 
 namespace Basemkhirat\Elasticsearch;
 
-<<<<<<< HEAD
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
-=======
-use Illuminate\Support\Collection;
-use Illuminate\Pagination\LengthAwarePaginator;
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
 use Illuminate\Support\Facades\Request;
 
 /**
@@ -106,7 +101,6 @@ class Query
     protected $sort = [];
 
     /**
-<<<<<<< HEAD
      * Query scroll time
      * @var string
      */
@@ -125,8 +119,6 @@ class Query
     protected $search_type;
 
     /**
-=======
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * Query limit
      * @var int
      */
@@ -189,7 +181,6 @@ public function type($type)
      */
     protected function getType()
     {
-<<<<<<< HEAD
 
         return $this->type;
 
@@ -254,9 +245,6 @@ public function getScroll()
 
         return $this->scroll;
 
-=======
-        return $this->type;
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
     }
 
     /**
@@ -273,7 +261,6 @@ public function take($take = 10)
     }
 
     /**
-<<<<<<< HEAD
      * Ignore bad HTTP response
      * @param array|int $code
      * @return $this
@@ -301,9 +288,6 @@ public function ignore($code)
 
     /**
      * Get the query limit
-=======
-     * get the query limit
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * @return int
      */
     protected function getTake()
@@ -442,11 +426,7 @@ public function _id($_id = false)
     }
 
     /**
-<<<<<<< HEAD
      * Set the query where clause
-=======
-     * set the query where clause
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * @param $name
      * @param string $operator
      * @param null $value
@@ -503,11 +483,7 @@ public function where($name, $operator = "=", $value = NULL)
     }
 
     /**
-<<<<<<< HEAD
      * Set the query inverse where clause
-=======
-     * set the query inverse where clause
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * @param $name
      * @param string $operator
      * @param null $value
@@ -559,11 +535,7 @@ public function whereNot($name, $operator = "=", $value = NULL)
     }
 
     /**
-<<<<<<< HEAD
      * Set the query where between clause
-=======
-     * set the query where between clause
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * @param $name
      * @param $first_value
      * @param $last_value
@@ -579,11 +551,7 @@ public function whereBetween($name, $first_value, $last_value)
     }
 
     /**
-<<<<<<< HEAD
      * Set the query where not between clause
-=======
-     * set the query where not between clause
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * @param $name
      * @param $first_value
      * @param $last_value
@@ -599,11 +567,7 @@ public function whereNotBetween($name, $first_value, $last_value)
     }
 
     /**
-<<<<<<< HEAD
      * Set the query where in clause
-=======
-     * set the query where in clause
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * @param $name
      * @param array $value
      * @return $this
@@ -623,11 +587,7 @@ public function whereIn($name, $value = [])
     }
 
     /**
-<<<<<<< HEAD
      * Set the query where not in clause
-=======
-     * set the query where not in clause
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * @param $name
      * @param array $value
      * @return $this
@@ -648,11 +608,7 @@ public function whereNotIn($name, $value = [])
 
 
     /**
-<<<<<<< HEAD
      * Set the query where exists clause
-=======
-     * set the query where exists clause
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * @param $name
      * @param bool $exists
      * @return $this
@@ -717,7 +673,6 @@ public function query()
 
         ];
 
-<<<<<<< HEAD
         $search_type = $this->getSearchType();
 
         if($search_type){
@@ -731,8 +686,6 @@ public function query()
         }
 
 
-=======
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
         return $query;
 
     }
@@ -754,7 +707,6 @@ protected function validate($query)
     }
 
 
-<<<<<<< HEAD
 
     /**
      * Clear scroll query id
@@ -798,20 +750,6 @@ public function get($scroll_id = NULL)
 
             $result = $this->connection->search($query);
         }
-=======
-    /**
-     * Get the collection of results
-     * @return array|Collection
-     */
-    public function get()
-    {
-
-        $query = $this->query();
-
-        $this->validate($query);
-
-        $result = $this->connection->search($query);
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
 
         return $this->getAll($result);
 
@@ -872,12 +810,8 @@ protected function getAll($result = [])
         $new->max_score = $result["hits"]["max_score"];
         $new->took = $result["took"];
         $new->timed_out = $result["timed_out"];
-<<<<<<< HEAD
         $new->scroll_id = isset($result["_scroll_id"]) ? $result["_scroll_id"] : NULL;
         $new->shards = (object)$result["_shards"];
-=======
-        $new->_shards = (object)$result["_shards"];
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
 
         return $new;
     }
@@ -1104,12 +1038,8 @@ public function raw()
      * @param bool $callback
      * @return mixed
      */
-<<<<<<< HEAD
     function createIndex($name, $callback = false)
     {
-=======
-    function createIndex($name, $callback = false){
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
 
         $index = new Index($name, $callback);
 
@@ -1125,12 +1055,8 @@ function createIndex($name, $callback = false){
      * @param $name
      * @return mixed
      */
-<<<<<<< HEAD
     function dropIndex($name)
     {
-=======
-    function dropIndex($name){
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
 
         $index = new Index($name);
 
@@ -1146,12 +1072,8 @@ function dropIndex($name){
      * @param bool $callback
      * @return mixed
      */
-<<<<<<< HEAD
     function create($callback = false)
     {
-=======
-    function create($callback = false){
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
 
         $index = new Index($this->index, $callback);
 
@@ -1165,12 +1087,8 @@ function create($callback = false){
      * Drop index [alias to dropIndex method]
      * @return mixed
      */
-<<<<<<< HEAD
     function drop()
     {
-=======
-    function drop(){
->>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
 
         $index = new Index($this->index);