Added missing getInAndWhereByPage() method in RepositoryInterface, mi…

…nor updates in readme
micheleangioni · May 10, 2017 · c54edf4 · c54edf4
1 parent 2f559c3
commit c54edf4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/readme.md b/readme.md
@@ -95,26 +95,26 @@ class PostsController extends Controller
 
 The `EloquentRepository` empowers automatically our repositories of the following public methods:
 
-- all()
-- find($id)
-- findOrFail($id)
-- first()
-- firstOrFail()
-- firstBy(array $where = [])
-- firstOrFailBy(array $where = [])
-- getBy(array $where = [])
-- getByLimit($limit, array $where = [])
-- getByOrder($orderBy, array $where = [], $order = 'desc', $limit = 0)
-- getIn($whereInKey, array $whereIn = [], $orderBy = NULL, $order = 'desc', $limit = 0)
-- getNotIn($whereNotInKey, array $whereNotIn = [], $orderBy = NULL, $order = 'desc', $limit = 0)
-- getInAndWhereByPage($page=1, $limit = 10, $whereInKey = null, array $whereIn = [], $where = [], $orderBy = null, $order = 'desc' )
-- getByPage($page = 1, $limit = 10, array $where = [], $orderBy = NULL, $order = 'desc')
-- create(array $inputs = [])
-- updateById($id, array $inputs)
-- destroy($id)
-- destroyFirstBy(array $where)
-- count()
-- countBy(array $where = [])
+- `all()`
+- `find($id)`
+- `findOrFail($id)`
+- `first()`
+- `firstOrFail()`
+- `firstBy(array $where = [])`
+- `firstOrFailBy(array $where = [])`
+- `getBy(array $where = [])`
+- `getByLimit(int $limit, array $where = [])`
+- `getByOrder(string $orderBy, array $where = [], string $order = 'desc', int $limit = 0)`
+- `getIn(string $whereInKey, array $whereIn = [], string $orderBy = null, string $order = 'desc', int $limit = 0)`
+- `getNotIn(string $whereNotInKey, array $whereNotIn = [], string $orderBy = null, string $order = 'desc', int $limit = 0)`
+- `getInAndWhereByPage(int $page = 1, int $limit = 10, string $whereInKey = null, array $whereIn = [], $where = [], $orderBy = null, string $order = 'desc')`
+- `getByPage(int $page = 1, int $limit = 10, array $where = [], string $orderBy = null, string $order = 'desc')`
+- `create(array $inputs = [])`
+- `updateById($id, array $inputs)`
+- `destroy($id)`
+- `destroyFirstBy(array $where)`
+- `count()`
+- `countBy(array $where = [])`
 
 ### The $where parameter
 

diff --git a/src/PhalconRepositories/RepositoryInterface.php b/src/PhalconRepositories/RepositoryInterface.php
@@ -24,11 +24,13 @@ public function getByLimit(int $limit, array $where = []);
 
     public function getByOrder(string $orderBy, array $where = [], string $order = 'desc', int $limit = 0);
 
-    public function getIn(string $whereInKey, array $whereIn = [], string $orderBy = NULL, string $order = 'desc', int $limit = 0);
+    public function getIn(string $whereInKey, array $whereIn = [], string $orderBy = null, string $order = 'desc', int $limit = 0);
 
-    public function getNotIn(string $whereNotInKey, array $whereNotIn = [], string $orderBy = NULL, string $order = 'desc', int $limit = 0);
+    public function getNotIn(string $whereNotInKey, array $whereNotIn = [], string $orderBy = null, string $order = 'desc', int $limit = 0);
 
-    public function getByPage(int $page = 1, int $limit = 10, array $where = [], string $orderBy = NULL, string $order = 'desc');
+    public function getInAndWhereByPage(int $page = 1, int $limit = 10, string $whereInKey = null, array $whereIn = [], $where = [], string $orderBy = null, string $order = 'desc' );
+
+    public function getByPage(int $page = 1, int $limit = 10, array $where = [], string $orderBy = null, string $order = 'desc');
 
     public function create(array $inputs = []);