Merge pull request #7 from alexkovt/feature/scroll

rollback last changes

Author: alexkovt

src/ElasticEngine.php

@@ -284,12 +284,12 @@ public function searchRaw(Model $model, $query)
      *
      * @param \Illuminate\Database\Eloquent\Model $model
      * @param $query
-     * @param int|null $size
-     * @param string|null $scroll
+     * @param $size
+     * @param $scroll
      * @return mixed
      * @throws \Exception
      */
-    public function searchRawWithScroll(Model $model, $query, $size = 10000, $scroll = '1m')
+    public function searchRawWithScroll(Model $model, $query, int $size = 10000, string $scroll = '1m')
     {
         $payload = (new TypePayload($model))
             ->setIfNotEmpty('body', $query)
@@ -305,10 +305,10 @@ public function searchRawWithScroll(Model $model, $query, $size = 10000, $scroll
      * Make a scroll.
      *
      * @param $scroll_id
-     * @param string|null $scroll
+     * @param $scroll
      * @return mixed
      */
-    public function scroll(string $scroll_id, $scroll = '1m')
+    public function scroll(string $scroll_id, string $scroll = '1m')
     {
         return ElasticClient::scroll([
             'scroll' => $scroll,

src/Searchable.php

@@ -141,11 +141,11 @@ public static function searchRaw(array $query)
      * Execute a raw search with scroll.
      *
      * @param $query
-     * @param int|null $size
-     * @param string|null $scroll
+     * @param $size
+     * @param $scroll
      * @return array
      */
-    public static function searchRawWithScroll(array $query, $size = 10000, $scroll = '1m')
+    public static function searchRawWithScroll(array $query, int $size = 10000, string $scroll = '1m')
     {
         $model = new static();
 
@@ -157,10 +157,10 @@ public static function searchRawWithScroll(array $query, $size = 10000, $scroll
      * Execute a scroll search.
      *
      * @param $scroll_id
-     * @param string|null $scroll
+     * @param $scroll
      * @return array
      */
-    public static function scroll(string $scroll_id, $scroll = '1m')
+    public static function scroll(string $scroll_id, string $scroll = '1m')
     {
         $model = new static();