Merge pull request #2516 from najdanovicivan/html-helper-lists-fix

HTML Helper - Fix attribute type for lists
codeigniter4 · Jan 27, 2020 · 2a69569 · 2a69569
2 parents 0550852 + ae971fe
commit 2a69569
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
@@ -51,11 +51,11 @@
 	 * Generates an HTML unordered list from an single or
 	 * multi-dimensional array.
 	 *
-	 * @param  array  $list
-	 * @param  string $attributes HTML attributes
+	 * @param  array $list
+	 * @param  mixed $attributes HTML attributes string, array, object
 	 * @return string
 	 */
-	function ul(array $list, string $attributes = ''): string
+	function ul(array $list, $attributes = ''): string
 	{
 		return _list('ul', $list, $attributes);
 	}
@@ -70,11 +70,11 @@ function ul(array $list, string $attributes = ''): string
 	 *
 	 * Generates an HTML ordered list from an single or multi-dimensional array.
 	 *
-	 * @param  array  $list
-	 * @param  string $attributes HTML attributes
+	 * @param  array $list
+	 * @param  mixed $attributes HTML attributes string, array, object
 	 * @return string
 	 */
-	function ol(array $list, string $attributes = ''): string
+	function ol(array $list, $attributes = ''): string
 	{
 		return _list('ol', $list, $attributes);
 	}
@@ -91,11 +91,11 @@ function ol(array $list, string $attributes = ''): string
 	 *
 	 * @param  string  $type
 	 * @param  mixed   $list
-	 * @param  string  $attributes
+	 * @param  mixed   $attributes string, array, object
 	 * @param  integer $depth
 	 * @return string
 	 */
-	function _list(string $type = 'ul', $list = [], string $attributes = '', int $depth = 0): string
+	function _list(string $type = 'ul', $list = [], $attributes = '', int $depth = 0): string
 	{
 		// Set the indentation based on the depth
 		$out = str_repeat(' ', $depth)