Merge pull request #37 from vietartisans/laravel6

OzanKurt · web-flow · commit 045c993ad607 · 2019-09-19T12:07:06.000+03:00
Laravel 6 compatible
diff --git a/src/Repositories/Eloquent/AbstractRepository.php b/src/Repositories/Eloquent/AbstractRepository.php
@@ -6,6 +6,7 @@
 use Kurt\Repoist\Exceptions\NoEntityDefined;
 use Kurt\Repoist\Repositories\Contracts\RepositoryInterface;
 use Kurt\Repoist\Repositories\Criteria\CriteriaInterface;
+use Illuminate\Support\Arr;
 
 abstract class AbstractRepository implements RepositoryInterface, CriteriaInterface
 {
@@ -136,7 +137,7 @@ public function delete($id)
      */
     public function withCriteria(...$criteria)
     {
-        $criteria = array_flatten($criteria);
+        $criteria = Arr::flatten($criteria);
 
         foreach ($criteria as $criterion) {
             $this->entity = $criterion->apply($this->entity);

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`use Kurt\Repoist\Exceptions\NoEntityDefined;`
`7`	`7`	`use Kurt\Repoist\Repositories\Contracts\RepositoryInterface;`
`8`	`8`	`use Kurt\Repoist\Repositories\Criteria\CriteriaInterface;`
	`9`	`+use Illuminate\Support\Arr;`
`9`	`10`
`10`	`11`	`abstract class AbstractRepository implements RepositoryInterface, CriteriaInterface`
`11`	`12`	`{`
`@@ -136,7 +137,7 @@ public function delete($id)`
`136`	`137`	`*/`
`137`	`138`	`public function withCriteria(...$criteria)`
`138`	`139`	`{`
`139`		`- $criteria = array_flatten($criteria);`
	`140`	`+ $criteria = Arr::flatten($criteria);`
`140`	`141`
`141`	`142`	`foreach ($criteria as $criterion) {`
`142`	`143`	`$this->entity = $criterion->apply($this->entity);`