diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-06-05 09:44:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-05 09:44:37 +0200 |
| commit | 735e2165d1ad16454ae1b2222a66345a74b82d14 (patch) | |
| tree | 4c3ee78046cb48080b2e4c1cfad8495979260bb9 /system/core | |
| parent | fdd4b816c8bb8c072e98a586b0b41786dd34d44c (diff) | |
| parent | dec2b56fa44803e1579804fe329fd45658c6217b (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 c4f6dd30b..bf9924df5 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -134,7 +134,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 806598921..399b1bd63 100644 --- a/system/core/Exceptions.php +++ b/system/core/Exceptions.php @@ -239,7 +239,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) { |