diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-06-05 09:44:37 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-06-05 09:45:35 +0200 |
| commit | ee9d428171dc201f51eaffdb62616312915681ff (patch) | |
| tree | a27f7d05c362dafe6b901da2ed854e44f665502e /system/core | |
| parent | ab0010f543d88fa19506907684a9d329d4dd94e3 (diff) | |
[ci skip] Merge pull request #5143 from TysonAndre/misc-phpdoc-nits
Fix misc inconsistencies between code and doc comments
Diffstat (limited to 'system/core')
| -rw-r--r-- | system/core/Common.php | 2 | ||||
| -rw-r--r-- | system/core/Exceptions.php | 2 | ||||
| -rw-r--r-- | system/core/compat/mbstring.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Common.php b/system/core/Common.php index 2fd5c5809..d6a1fdb4e 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -135,7 +135,7 @@ if ( ! function_exists('load_class')) * * @param string the class name being requested * @param string the directory where the class should be found - * @param string an optional argument to pass to the class constructor + * @param mixed an optional argument to pass to the class constructor * @return object */ function &load_class($class, $directory = 'libraries', $param = NULL) diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php index 47d153f49..526909602 100644 --- a/system/core/Exceptions.php +++ b/system/core/Exceptions.php @@ -231,7 +231,7 @@ class CI_Exceptions { * @param string $message Error message * @param string $filepath File path * @param int $line Line number - * @return string Error page output + * @return void */ public function show_php_error($severity, $message, $filepath, $line) { diff --git a/system/core/compat/mbstring.php b/system/core/compat/mbstring.php index f466e1c34..1b2f2c63b 100644 --- a/system/core/compat/mbstring.php +++ b/system/core/compat/mbstring.php @@ -68,7 +68,7 @@ if ( ! function_exists('mb_strlen')) * @link http://php.net/mb_strlen * @param string $str * @param string $encoding - * @return string + * @return int */ function mb_strlen($str, $encoding = NULL) { |