Merge pull request #167 from Te7a-Houdini/use-facade-methods-instead-of-helper-functions

 Use Str:: & Arr:: Instead Of Helper Methods

Author: freekmurze

src/Filters/FiltersScope.php

@@ -2,14 +2,16 @@
 
 namespace Spatie\QueryBuilder\Filters;
 
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Builder;
 
 class FiltersScope implements Filter
 {
     public function __invoke(Builder $query, $values, string $property) : Builder
     {
-        $scope = camel_case($property);
-        $values = array_wrap($values);
+        $scope = Str::camel($property);
+        $values = Arr::wrap($values);
 
         return $query->$scope(...$values);
     }

src/QueryBuilder.php

@@ -2,6 +2,7 @@
 
 namespace Spatie\QueryBuilder;
 
+use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Illuminate\Database\Eloquent\Builder;
@@ -86,7 +87,7 @@ public function allowedFields($fields): self
 
         $this->allowedFields = collect($fields)
             ->map(function (string $fieldName) {
-                if (! str_contains($fieldName, '.')) {
+                if (! Str::contains($fieldName, '.')) {
                     $modelTableName = $this->getModel()->getTable();
 
                     return "{$modelTableName}.{$fieldName}";
@@ -402,7 +403,7 @@ protected function guardAgainstUnknownFields()
     {
         $fields = $this->request->fields()
             ->map(function ($fields, $model) {
-                $tableName = snake_case(preg_replace('/-/', '_', $model));
+                $tableName = Str::snake(preg_replace('/-/', '_', $model));
 
                 $fields = array_map('snake_case', $fields);
 

src/QueryBuilderServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace Spatie\QueryBuilder;
 
+use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Illuminate\Support\ServiceProvider;
@@ -66,7 +67,7 @@ public function boot()
                     return collect($value)->map($this->bindTo($this))->all();
                 }
 
-                if (str_contains($value, ',')) {
+                if (Str::contains($value, ',')) {
                     return explode(',', $value);
                 }
 

tests/RelationFilterTest.php

@@ -2,6 +2,7 @@
 
 namespace Spatie\QueryBuilder\Tests;
 
+use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Spatie\QueryBuilder\Filter;
 use Spatie\QueryBuilder\QueryBuilder;
@@ -128,7 +129,7 @@ public function it_can_filter_and_reject_results_by_exact_property()
     /** @test */
     public function given_the_models_table_name_it_does_filter_by_property_rather_than_relation()
     {
-        TestModel::create(['name' => $name = str_random()]);
+        TestModel::create(['name' => $name = Str::random()]);
 
         $result = $this
             ->createQueryFromFilterRequest(['test_models.name' => $name])