Merge pull request #4638 from kasimtan/phpdoc_fixes
[ci skip] Fixed PHPDoc parameter name and type discrepancies
diff --git a/system/core/Loader.php b/system/core/Loader.php
index c742ae7..d2c3508 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -1106,7 +1106,7 @@
* @used-by CI_Loader::_ci_load_library()
* @uses CI_Loader::_ci_init_library()
*
- * @param string $library Library name to load
+ * @param string $library_name Library name to load
* @param string $file_path Path to the library filename, relative to libraries/
* @param mixed $params Optional parameters to pass to the class constructor
* @param string $object_name Optional object name to assign to
diff --git a/system/core/Log.php b/system/core/Log.php
index 1abdaa0..9861215 100644
--- a/system/core/Log.php
+++ b/system/core/Log.php
@@ -237,7 +237,7 @@
*
* @param string $level The error level
* @param string $date Formatted date string
- * @param string $msg The log message
+ * @param string $message The log message
* @return string Formatted log line with a new line character '\n' at the end
*/
protected function _format_line($level, $date, $message)
diff --git a/system/core/Output.php b/system/core/Output.php
index ec9c21b..06ff101 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -285,7 +285,7 @@
/**
* Get Header
*
- * @param string $header_name
+ * @param string $header
* @return string
*/
public function get_header($header)
diff --git a/system/core/compat/standard.php b/system/core/compat/standard.php
index 47d47ae..c54cab9 100644
--- a/system/core/compat/standard.php
+++ b/system/core/compat/standard.php
@@ -62,7 +62,7 @@
* array_column()
*
* @link http://php.net/array_column
- * @param string $array
+ * @param array $array
* @param mixed $column_key
* @param mixed $index_key
* @return array
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index 3e10395..8825ecc 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -568,7 +568,7 @@
*
* @param string The text to appear onscreen
* @param string The id the label applies to
- * @param string Additional attributes
+ * @param array Additional attributes
* @return string
*/
function form_label($label_text = '', $id = '', $attributes = array())
diff --git a/system/libraries/Cache/drivers/Cache_apc.php b/system/libraries/Cache/drivers/Cache_apc.php
index 07ea8f4..fb8df03 100644
--- a/system/libraries/Cache/drivers/Cache_apc.php
+++ b/system/libraries/Cache/drivers/Cache_apc.php
@@ -97,7 +97,7 @@
*
* @param string $id Cache ID
* @param mixed $data Data to store
- * @param int $ttol Length of time (in seconds) to cache the data
+ * @param int $ttl Length of time (in seconds) to cache the data
* @param bool $raw Whether to store the raw value
* @return bool TRUE on success, FALSE on failure
*/
diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 1bdc6e5..3b391a8 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -730,7 +730,7 @@
*
* Legacy CI_Session compatibility method
*
- * @param mixed $data Session data key(s)
+ * @param mixed $key Session data key(s)
* @return void
*/
public function unset_userdata($key)
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index f241837..fa36505 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -286,7 +286,7 @@
/**
* Constructor
*
- * @param array $props
+ * @param array $config
* @return void
*/
public function __construct($config = array())