Merge pull request #201 from lucasmichot/feature/do-not-use-array-helpers

Do not use array helpers

Author: lucasmichot

src/Builders/FilterBuilder.php

@@ -3,6 +3,7 @@
 namespace ScoutElastic\Builders;
 
 use Laravel\Scout\Builder;
+use Illuminate\Support\Arr;
 use Illuminate\Database\Eloquent\Model;
 
 class FilterBuilder extends Builder
@@ -515,7 +516,7 @@ public function select($fields)
     {
         $this->select = array_merge(
             $this->select,
-            array_wrap($fields)
+            Arr::wrap($fields)
         );
 
         return $this;
@@ -540,7 +541,7 @@ public function withTrashed()
     {
         $this->wheres['must'] = collect($this->wheres['must'])
             ->filter(function ($item) {
-                return array_get($item, 'term.__soft_deleted') !== 0;
+                return Arr::get($item, 'term.__soft_deleted') !== 0;
             })
             ->values()
             ->all();

src/ElasticEngine.php

@@ -4,6 +4,7 @@
 
 use stdClass;
 use Laravel\Scout\Builder;
+use Illuminate\Support\Arr;
 use Laravel\Scout\Engines\Engine;
 use ScoutElastic\Payloads\TypePayload;
 use Illuminate\Database\Eloquent\Model;
@@ -296,7 +297,7 @@ public function map(Builder $builder, $results, $model)
 
         $primaryKey = $model->getKeyName();
 
-        $columns = array_get($results, '_payload.body._source');
+        $columns = Arr::get($results, '_payload.body._source');
 
         if (is_null($columns)) {
             $columns = ['*'];

src/Payloads/RawPayload.php

@@ -2,6 +2,8 @@
 
 namespace ScoutElastic\Payloads;
 
+use Illuminate\Support\Arr;
+
 class RawPayload
 {
     /**
@@ -21,7 +23,7 @@ class RawPayload
     public function set($key, $value)
     {
         if (! is_null($key)) {
-            array_set($this->payload, $key, $value);
+            Arr::set($this->payload, $key, $value);
         }
 
         return $this;
@@ -67,7 +69,7 @@ public function setIfNotNull($key, $value)
      */
     public function has($key)
     {
-        return array_has($this->payload, $key);
+        return Arr::has($this->payload, $key);
     }
 
     /**
@@ -80,15 +82,15 @@ public function has($key)
     public function add($key, $value)
     {
         if (! is_null($key)) {
-            $currentValue = array_get($this->payload, $key, []);
+            $currentValue = Arr::get($this->payload, $key, []);
 
             if (! is_array($currentValue)) {
-                $currentValue = array_wrap($currentValue);
+                $currentValue = Arr::wrap($currentValue);
             }
 
             $currentValue[] = $value;
 
-            array_set($this->payload, $key, $currentValue);
+            Arr::set($this->payload, $key, $currentValue);
         }
 
         return $this;
@@ -119,6 +121,6 @@ public function addIfNotEmpty($key, $value)
      */
     public function get($key = null, $default = null)
     {
-        return array_get($this->payload, $key, $default);
+        return Arr::get($this->payload, $key, $default);
     }
 }

src/Searchable.php

@@ -3,6 +3,7 @@
 namespace ScoutElastic;
 
 use Exception;
+use Illuminate\Support\Arr;
 use ScoutElastic\Builders\FilterBuilder;
 use ScoutElastic\Builders\SearchBuilder;
 use Laravel\Scout\Searchable as ScoutSearchable;
@@ -73,7 +74,7 @@ public function getMapping()
         $mapping = $this->mapping ?? [];
 
         if ($this::usesSoftDelete() && config('scout.soft_delete', false)) {
-            array_set($mapping, 'properties.__soft_deleted', ['type' => 'integer']);
+            Arr::set($mapping, 'properties.__soft_deleted', ['type' => 'integer']);
         }
 
         return $mapping;

tests/Config.php

@@ -2,6 +2,8 @@
 
 namespace ScoutElastic\Tests;
 
+use Illuminate\Support\Arr;
+
 class Config
 {
     /**
@@ -15,7 +17,7 @@ class Config
      */
     public static function set($key, $value)
     {
-        array_set(static::$values, $key, $value);
+        Arr::set(static::$values, $key, $value);
     }
 
     /**
@@ -25,7 +27,7 @@ public static function set($key, $value)
      */
     public static function get($key = null, $default = null)
     {
-        return array_get(static::$values, $key, $default);
+        return Arr::get(static::$values, $key, $default);
     }
 
     /**