Add orderBy and limit; Bugfix Entity parameters

src/Model.php

@@ -292,6 +292,39 @@ public function get(int $limit = null, int $offset = 0, bool $reset = true)
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * ORDER BY
+	 *
+	 * @param string  $orderBy
+	 * @param string  $direction ASC, DESC or RANDOM
+	 * @param boolean $escape
+	 *
+	 * @return $this
+	 */
+	public function orderBy(string $orderBy, string $direction = 'ASC', bool $escape = null)
+	{
+		$this->builder = $this->builder()->orderBy($orderBy, $direction);
+
+		return $this;
+	}
+
+	/**
+	 * LIMIT
+	 *
+	 * @param integer $value  LIMIT value
+	 * @param integer $offset OFFSET value
+	 *
+	 * @return $this
+	 */
+	public function limit(int $value = null, ?int $offset = 0)
+	{
+		$this->builder = $this->builder()->limit($value);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Format the results of the query. Returns an array of
 	 * individual data rows, which can be either an 'array', an
@@ -440,7 +473,7 @@ public function insert($data = null, bool $returnID = true)
 		// Convert to an array
 		if (is_object($data))
 		{
-			$data = (array) $data;
+			$data = self::classToArray($data);
 		}
 
 		// Check if an ID was provided
@@ -508,7 +541,7 @@ public function update(string $id, $data): bool
 		// Convert to an array
 		if (is_object($data))
 		{
-			$data = (array) $data;
+			$data = self::classToArray($data);
 		}
 
 		// Must be called first so we don't strip out updated_at values
@@ -672,7 +705,7 @@ protected function doProtectFields(array $data): array
 	//--------------------------------------------------------------------
 
 	/**
-	 * Takes a class an returns an array of it's public and protected
+	 * Takes a class and returns an array of it's public and protected
 	 * properties as an array suitable for use in creates and updates.
 	 *
 	 * @param string|object $data
@@ -681,7 +714,6 @@ protected function doProtectFields(array $data): array
 	 * @param boolean       $onlyChanged
 	 *
 	 * @return array
-	 * @throws \ReflectionException
 	 */
 	public static function classToArray($data, $primaryKey = null, string $dateFormat = 'datetime'): array
 	{