fix conflicts

Jerrycyl · Aug 14, 2018 · 1b759ce · 1b759ce
2 parents 956db6f + 8facfa9
commit 1b759ce
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Concerns/ManagesTransactions.php b/Concerns/ManagesTransactions.php
@@ -26,7 +26,7 @@ public function transaction(Closure $callback, $attempts = 1)
             // catch any exception we can rollback this transaction so that none of this
             // gets actually persisted to a database or stored in a permanent fashion.
             try {
-                return tap($callback($this), function ($result) {
+                return tap($callback($this), function () {
                     $this->commit();
                 });
             }

diff --git a/Query/Builder.php b/Query/Builder.php
@@ -1389,7 +1389,7 @@ public function addWhereExistsQuery(self $query, $boolean = 'and', $not = false)
     {
         $type = $not ? 'NotExists' : 'Exists';
 
-        $this->wheres[] = compact('type', 'operator', 'query', 'boolean');
+        $this->wheres[] = compact('type', 'query', 'boolean');
 
         $this->addBinding($query->getBindings(), 'where');
 
@@ -1415,7 +1415,7 @@ public function whereRowValues($columns, $operator, $values, $boolean = 'and')
 
         $this->wheres[] = compact('type', 'columns', 'operator', 'values', 'boolean');
 
-        $this->addBinding($values);
+        $this->addBinding($this->cleanBindings($values));
 
         return $this;
     }

diff --git a/Query/Grammars/Grammar.php b/Query/Grammars/Grammar.php
@@ -490,9 +490,11 @@ protected function whereNotExists(Builder $query, $where)
      */
     protected function whereRowValues(Builder $query, $where)
     {
+        $columns = $this->columnize($where['columns']);
+
         $values = $this->parameterize($where['values']);
 
-        return '('.implode(', ', $where['columns']).') '.$where['operator'].' ('.$values.')';
+        return '('.$columns.') '.$where['operator'].' ('.$values.')';
     }
 
     /**