Update

Author: Jakiboy

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "floatphp/kernel",
-  "version" : "1.4.0",
+  "version" : "1.4.1",
   "type": "library",
   "description": "FloatPHP Kernel Components",
   "keywords": ["php","micro-framework","framework","PSR","ORM","jakiboy","composer"],

src/Orm.php

@@ -153,7 +153,7 @@ public function read($id = null) : array
 		if ( $id ) $this->{$this->key} = $id;
 		$sql = "{$this->getSelectQuery()} ";
 		$sql .= "{$this->getWhereQuery(single: true)} ";
-		$sql .= "{$this->getLimitQuery(limit: 1)};";
+		$sql .= "{$this->getLimitQuery(1)};";
 		return $this->getRow($sql);
 	}
 
@@ -211,7 +211,7 @@ public function delete($id = null) : bool
 		if ( $id ) $this->{$this->key} = $id;
 		$sql = "{$this->getDeleteQuery()} ";
 		$sql .= "{$this->getWhereQuery(single: true)} ";
-		$sql .= "{$this->getLimitQuery(limit: 1)};";
+		$sql .= "{$this->getLimitQuery(1)};";
 		return (bool)$this->execute($sql);
 	}
 
@@ -271,14 +271,15 @@ public function query(string $sql, ?array $bind = null, ?string $type = null, ?i
 	 * @param mixed $columns
 	 * @param array $sort
 	 * @param int $limit
+	 * @param ?int $page
 	 * @return array
 	 */
-	public function search($columns = '*', array $sort = [], ?int $limit = 0) : array
+	public function search($columns = '*', array $sort = [], int $limit = 0, ?int $page = null) : array
 	{
 		$sql = "{$this->getSelectQuery($columns)} ";
 		$sql .= "{$this->getWhereQuery()} ";
 		$sql .= "{$this->getSortQuery($sort)} ";
-		$sql .= "{$this->getLimitQuery($limit)};";
+		$sql .= "{$this->getLimitQuery($limit, $page)};";
 		return (array)$this->execute($sql);
 	}
 
@@ -296,7 +297,7 @@ public function searchOne($columns = '*', array $sort = []) : array
 		$sql = "{$this->getSelectQuery($columns)} ";
 		$sql .= "{$this->getWhereQuery()} ";
 		$sql .= "{$this->getSortQuery($sort)} ";
-		$sql .= "{$this->getLimitQuery(limit: 1)};";
+		$sql .= "{$this->getLimitQuery(1)};";
 		return $this->getRow($sql);
 	}
 
@@ -308,14 +309,15 @@ public function searchOne($columns = '*', array $sort = []) : array
 	 * @param string $column
 	 * @param array $sort
 	 * @param int $limit
+	 * @param ?int $page
 	 * @return array
 	 */
-	public function searchColumn(string $column, array $sort = [], ?int $limit = 0) : array
+	public function searchColumn(string $column, array $sort = [], int $limit = 0, ?int $page = null) : array
 	{
 		$sql = "{$this->getSelectQuery($column)} ";
 		$sql .= "{$this->getWhereQuery()} ";
 		$sql .= "{$this->getSortQuery($sort)} ";
-		$sql .= "{$this->getLimitQuery($limit)};";
+		$sql .= "{$this->getLimitQuery($limit, $page)};";
 		return $this->getColumn($sql);
 	}
 
@@ -912,13 +914,21 @@ private function getSortQuery(array $sort = []) : string
 	 *
 	 * @access private
 	 * @param int $limit
+	 * @param ?int $page
 	 * @return string
 	 */
-	private function getLimitQuery(?int $limit = 0) : string
+	private function getLimitQuery(int $limit = 0, ?int $page = null) : string
 	{
 		$sql = '';
 		if ( $limit ) {
-			$sql .= "LIMIT {$limit}";
+			if ( !$this->isType('null', $page) ) {
+				$page = $page ?: 1;
+				$offset = ($page - 1) * $limit;
+				$sql .= "LIMIT {$offset}, {$limit}";
+
+			} else {
+				$sql .= "LIMIT {$limit}";
+			}
 		}
 		return $sql;
 	}

src/View.php

@@ -157,8 +157,8 @@ protected function getDefaultCallables() : array
             'getTimeout'     => function () : int {
                 return $this->getTimeout();
             },
-            'getToken'       => function (?string $source = null) : string {
-                return $this->getToken(action: $source);
+            'getToken'       => function (?string $action = null) : string {
+                return $this->getToken($action);
             },
             'getLanguage'    => function () : string {
                 return $this->getLanguage();
@@ -169,7 +169,7 @@ protected function getDefaultCallables() : array
             'hasRole'        => function ($role = null, $userId = null) : bool {
                 return $this->hasRole($role, $userId);
             },
-            'hasCapability'  => function ($capability = null, $userId = null) {
+            'hasCapability'  => function ($capability = null, $userId = null) : bool {
                 return $this->hasCapability($capability, $userId);
             },
             'translate'      => function (?string $string) : string {