some fixes

lessmore92 · Feb 19, 2020 · 00b5bca · 00b5bca
1 parent 16ee84e
commit 00b5bca
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/src/EloquentMarshallServiceProvider.php b/src/EloquentMarshallServiceProvider.php
@@ -17,7 +17,7 @@ public function register()
             SortParameterParser::class
         );
 
-        Builder::macro('searchable', function ($inputs = null) {
+        Builder::/** @scrutinizer ignore-call */ macro('searchable', function ($inputs = null) {
             $searchable = new Searchable();
             if ($inputs === null)
             {
@@ -31,14 +31,15 @@ public function register()
             return $query;
         });
 
-        Builder::macro('sortable', function ($sort_param_anme = null) {
+        Builder::/** @scrutinizer ignore-call */ macro('sortable', function ($sorts = null) {
             $sortable = new Sortable();
-            if ($sort_param_anme === null)
+            if ($sorts === null)
             {
-                $sorts = Request::get(config('eloquent_marshall.sort_param_name', 'sort'));
+                $sorts = Request::get(/** @scrutinizer ignore-call */ config('eloquent_marshall.sort_param_name', 'sort'));
             }
 
-            $parser = resolve(SortParameterParserInterface::class);
+            $parser = /** @scrutinizer ignore-call */
+                resolve(SortParameterParserInterface::class);
             $sorts  = $parser->parse($sorts);
 
             /**

diff --git a/src/Foundation/FilterFactory.php b/src/Foundation/FilterFactory.php
@@ -25,7 +25,8 @@ public function make(string $name, Model $model)
         $this->resolveFilter($name, $model);
         if (class_exists($this->getNamespace()))
         {
-            $filter = app($this->getNamespace());
+            $filter = /** @scrutinizer ignore-call */
+                app($this->getNamespace());
             return $filter;
         }
         return false;

diff --git a/src/Foundation/SortFactory.php b/src/Foundation/SortFactory.php
@@ -25,7 +25,8 @@ public function make(string $name, Model $model)
         $this->resolveSort($name, $model);
         if (class_exists($this->getNamespace()))
         {
-            $sort = app($this->getNamespace());
+            $sort = /** @scrutinizer ignore-call */
+                app($this->getNamespace());
             return $sort;
         }
         return false;

diff --git a/src/Foundation/SortParameterParser.php b/src/Foundation/SortParameterParser.php
@@ -15,7 +15,8 @@ class SortParameterParser implements SortParameterParserInterface
     public function parse($sort_parameter): array
     {
         $_sorts         = [];
-        $_default_order = config('eloquent-marshall.default_sort_order', 'desc');
+        $_default_order = /** @scrutinizer ignore-call */
+            config('eloquent-marshall.default_sort_order', 'desc');
         if (!$this->sort_string_is_valid($sort_parameter))
         {
             return $_sorts;
@@ -27,6 +28,7 @@ public function parse($sort_parameter): array
         }
         else
         {
+            $sorts   = array();
             $sorts[] = $sort_parameter;
         }
 

diff --git a/src/Searchable.php b/src/Searchable.php
@@ -45,7 +45,7 @@ public function applyFilters($query, $filters)
     {
         foreach ($filters as $filter => $value)
         {
-            $_filter = $this->filterFactory->make($filter, $query->getModel());
+            $_filter = $this->filterFactory->make($filter, $query->/** @scrutinizer ignore-call */ getModel());
             if ($_filter instanceof Search)
             {
                 $query = $_filter->apply($query, $value);

diff --git a/src/Sortable.php b/src/Sortable.php
@@ -45,7 +45,7 @@ public function applySorts($query, $sorts)
     {
         foreach ($sorts as $sort => $value)
         {
-            $_sort = $this->sortFactory->make($sort, $query->getModel());
+            $_sort = $this->sortFactory->make($sort, $query->/** @scrutinizer ignore-call */ getModel());
             if ($_sort instanceof Sort)
             {
                 $query = $_sort->apply($query, $value);