Fix sync, added aplyscope findWhereIn and findWhereNotInt

andersao · Mar 9, 2017 · baa74a8 · baa74a8
1 parent 1363f76
commit baa74a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Prettus/Repository/Contracts/RepositoryInterface.php b/src/Prettus/Repository/Contracts/RepositoryInterface.php
@@ -31,12 +31,11 @@ public function pluck($column, $key = null);
     /**
      * Sync relations
      *
-     * @param $id
      * @param $relation
      * @param array $attributes
      * @return $this
      */
-    public function sync($id, $relation, $attributes);
+    public function sync($relation, $attributes);
 
     /**
      * Retrieve all data of repository

diff --git a/src/Prettus/Repository/Eloquent/BaseRepository.php b/src/Prettus/Repository/Eloquent/BaseRepository.php
@@ -285,12 +285,11 @@ public function pluck($column, $key = null)
     /**
      * Sync relations
      *
-     * @param $id
      * @param $relation
      * @param array $attributes
      * @return $this
      */
-    public function sync($id, $relation, $attributes)
+    public function sync($relation, $attributes)
     {
         $this->model = $this->model->with($relation)->getRelation($relation)->sync($attributes);
         return $this;
@@ -444,6 +443,7 @@ public function findWhere(array $where, $columns = ['*'])
     public function findWhereIn($field, array $values, $columns = ['*'])
     {
         $this->applyCriteria();
+        $this->applyScope();
         $model = $this->model->whereIn($field, $values)->get($columns);
         $this->resetModel();
 
@@ -462,6 +462,7 @@ public function findWhereIn($field, array $values, $columns = ['*'])
     public function findWhereNotIn($field, array $values, $columns = ['*'])
     {
         $this->applyCriteria();
+        $this->applyScope();
         $model = $this->model->whereNotIn($field, $values)->get($columns);
         $this->resetModel();