Merge pull request #6 from Weebly/bugfix-closure-query

Better Eloquent support

Author: elliotfehr

src/Database/EloquentBuilder.php

@@ -2,9 +2,9 @@
 
 namespace Weebly\Mutate\Database;
 
-use Closure;
 use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Query\Expression;
 
 class EloquentBuilder extends Builder
 {
@@ -18,34 +18,87 @@ class EloquentBuilder extends Builder
      */
     public function where($column, $operator = null, $value = null, $boolean = 'and')
     {
-        if ($column instanceof Closure) {
-            return parent::where($column, $operator, $value, $boolean);
-        }
+        $bindings = $this->query->bindings;
+
+        parent::where($column, $operator, $value, $boolean);
+
+        // Remove the last item of the array
+        $where = array_pop($this->query->wheres);
 
-        if (func_num_args() === 2) {
-            $value = $operator;
-            $operator = '=';
+        if ($where['type'] === 'Nested') {
+            // Add where statement back and return
+            $this->query->wheres[] = $where;
+
+            return $this;
         }
 
-        $mutatedColumn = $this->getUnqualifiedColumnName($column);
-        $value = $this->model->serializeAttribute($mutatedColumn, $value);
+        // Get the column name
+        $mutatedColumn = $this->getUnqualifiedColumnName($where['column']);
+
+        // Modify the values
+        $where['value'] = $this->model->serializeAttribute($mutatedColumn, $where['value']);
 
-        return parent::where($mutatedColumn, $operator, $value, $boolean);
+        // Add where statement back
+        $this->query->wheres[] = $where;
+
+        // Add the mutated bindings
+        if (! $where['value'] instanceof Expression) {
+            // Reset the bindings to the previous value
+            $this->query->bindings = $bindings;
+
+            // Add the mutated bindings back
+            $this->addBinding($where['value'], 'where');
+        }
+
+        return $this;
     }
 
     /**
      * {@inheritdoc}
      */
     public function whereIn($column, $values, $boolean = 'and', $not = false)
     {
-        $mutatedColumn = $this->getUnqualifiedColumnName($column);
+        $bindings = $this->query->bindings;
+
+        parent::whereIn($column, $values, $boolean, $not);
 
+        // Remove the last item of the array
+        $where = array_pop($this->query->wheres);
+
+        if ($where['type'] === 'Nested') {
+            // Add where statement back and return
+            $this->query->wheres[] = $where;
+
+            return $this;
+        }
+
+        // Get the column name
+        $mutatedColumn = $this->getUnqualifiedColumnName($where['column']);
+
+        // Loop over all values and mutate them
         $mutatedValues = [];
-        foreach ($values as $value) {
+        foreach ($where['values'] as $value) {
             $mutatedValues[] = $this->model->serializeAttribute($mutatedColumn, $value);
         }
 
-        return parent::whereIn($column, $mutatedValues, $boolean, $not);
+        // Modify the values
+        $where['values'] = $mutatedValues;
+
+        // Add where statement back
+        $this->query->wheres[] = $where;
+
+        // Loop over all the mutated values and add the bindings
+        foreach ($mutatedValues as $value) {
+            if (! $value instanceof Expression) {
+                // Reset the bindings to the previous value
+                $this->query->bindings = $bindings;
+
+                // Add the mutated bindings back
+                $this->addBinding($value, 'where');
+            }
+        }
+
+        return $this;
     }
 
     /**

tests/Integration/MutatorTest.php

@@ -31,8 +31,7 @@ protected function getEnvironmentSetUp($app)
 
         $app->singleton('mutator', function (Application $app) {
             $mutator = new MutatorProvider();
-            $default_mutators = require realpath(__DIR__.'/../../config/config.php');
-            $default_mutators = $default_mutators['enabled'];
+            $default_mutators = (require realpath(__DIR__.'/../../config/config.php'))['enabled'];
 
             $mutator->registerMutators($default_mutators);
 
@@ -136,6 +135,22 @@ public function test_timestamps()
         $this->assertTrue(ctype_digit($values->created_at));
         $this->assertTrue(ctype_digit($values->updated_at));
     }
+
+    public function test_where_closure()
+    {
+        $id = Uuid::uuid1()->toString();
+        $location = 'Foo';
+        (new TestModel())->create(['id' => $id, 'name' => 'A chair', 'location' => $location])->save();
+
+        $model = TestModel::where('name', '=', 'A chair')
+            ->where(function ($q) use ($id) {
+                $q->where('id', '=', $id)
+                    ->orWhere('id', '=', Uuid::uuid1()->toString());
+            })->get();
+
+        $this->assertEquals(1, count($model));
+        $this->assertEquals($id, $model[0]->id);
+    }
 }
 
 class TestModel extends Model
@@ -176,10 +191,19 @@ class TestModel extends Model
 
 class TimestampedModel extends Model
 {
+    /**
+     * {@inheritdoc}
+     */
     protected $table = 'timestamped_model';
 
+    /**
+     * {@inheritdoc}
+     */
     protected $guarded = [];
 
+    /**
+     * {@inheritdoc}
+     */
     protected $mutate = [
         'created_at' => 'unix_timestamp',
         'updated_at' => 'unix_timestamp',