Type-hint csv_from_result(), xml_from_result() DB utilities

narfbg · narfbg · commit b1cde1fdd77a · 2015-12-08T13:10:41.000+02:00
Close bcit-ci#4299
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
@@ -235,13 +235,8 @@ public function repair_table($table_name)
 	 * @param	string	$enclosure	Enclosure (default: ")
 	 * @return	string
 	 */
-	public function csv_from_result($query, $delim = ',', $newline = "\n", $enclosure = '"')
+	public function csv_from_result(CI_DB_result $query, $delim = ',', $newline = "\n", $enclosure = '"')
 	{
-		if ( ! is_object($query) OR ! method_exists($query, 'list_fields'))
-		{
-			show_error('You must submit a valid result object');
-		}
-
 		$out = '';
 		// First generate the headings from the table column names
 		foreach ($query->list_fields() as $name)
@@ -274,13 +269,8 @@ public function csv_from_result($query, $delim = ',', $newline = "\n", $enclosur
 	 * @param	array	$params	Any preferences
 	 * @return	string
 	 */
-	public function xml_from_result($query, $params = array())
+	public function xml_from_result(CI_DB_result $query, $params = array())
 	{
-		if ( ! is_object($query) OR ! method_exists($query, 'list_fields'))
-		{
-			show_error('You must submit a valid result object');
-		}
-
 		// Set our default values
 		foreach (array('root' => 'root', 'element' => 'element', 'newline' => "\n", 'tab' => "\t") as $key => $val)
 		{
