v3.1.7

* Core: - Fixes `Orchestra\Support\Traits\QueryFilterTrait::setupWildcardQueryFilter()` to group where clause when generating queries. Signed-off-by: crynobone <[email protected]>
orchestral · Nov 25, 2015 · bd2d445 · bd2d445
1 parent 7ea1cea
commit bd2d445
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/docs/changes.md b/docs/changes.md
@@ -5,6 +5,11 @@ title: Support Change Log
 
 ## Version 3.1 {#v3-1}
 
+### v3.1.7 {#v3-1-7}
+
+* Core:
+  - Fixes `Orchestra\Support\Traits\QueryFilterTrait::setupWildcardQueryFilter()` to group where clause when generating queries.
+
 ### v3.1.6 {#v3-1-6}
 
 * Core:

diff --git a/src/Support/Traits/QueryFilterTrait.php b/src/Support/Traits/QueryFilterTrait.php
@@ -129,7 +129,7 @@ protected function buildWildcardQueryFilters($query, array $fields, array $keywo
     }
 
     /**
-     * Build wildcard query filter by keyword,.
+     * Build wildcard query filter by keyword.
      *
      * @param  \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder  $query
      * @param  string  $field

diff --git a/tests/Traits/QueryFilterTraitTest.php b/tests/Traits/QueryFilterTraitTest.php
@@ -69,7 +69,11 @@ public function testSetupWildcardQueryFilterMethod()
     {
         $query = m::mock('\Illuminate\Database\Query\Builder');
 
-        $query->shouldReceive('orWhere')->once()->with(m::type('Closure'))
+        $query->shouldReceive('where')->once()->with(m::type('Closure'))
+                ->andReturnUsing(function ($c) use ($query) {
+                    $c($query);
+                })
+            ->shouldReceive('orWhere')->once()->with(m::type('Closure'))
                 ->andReturnUsing(function ($c) use ($query) {
                     $c($query);
                 })