@@ -121,7 +121,7 @@ |
||
| 121 | 121 | * @param string $file Configuration file name |
| 122 | 122 | * @param bool $use_sections Whether configuration values should be loaded into their own section |
| 123 | 123 | * @param bool $fail_gracefully Whether to just return FALSE or display an error message |
| 124 | - * @return bool TRUE if the file was loaded correctly or FALSE on failure |
|
| 124 | + * @return boolean|null TRUE if the file was loaded correctly or FALSE on failure |
|
| 125 | 125 | */ |
| 126 | 126 | public function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) |
| 127 | 127 | { |
@@ -148,7 +148,7 @@ |
||
| 148 | 148 | * and displays it using the specified template. |
| 149 | 149 | * |
| 150 | 150 | * @param string $heading Page heading |
| 151 | - * @param string|string[] $message Error message |
|
| 151 | + * @param string $message Error message |
|
| 152 | 152 | * @param string $template Template name |
| 153 | 153 | * @param int $status_code (default: 500) |
| 154 | 154 | * |
@@ -160,7 +160,7 @@ |
||
| 160 | 160 | * Runs a particular hook |
| 161 | 161 | * |
| 162 | 162 | * @param array $data Hook details |
| 163 | - * @return bool TRUE on success or FALSE on failure |
|
| 163 | + * @return boolean|null TRUE on success or FALSE on failure |
|
| 164 | 164 | */ |
| 165 | 165 | protected function _run_hook($data) |
| 166 | 166 | { |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | /** |
| 234 | 234 | * Fetch an item from the GET array |
| 235 | 235 | * |
| 236 | - * @param mixed $index Index for item to be fetched from $_GET |
|
| 236 | + * @param string $index Index for item to be fetched from $_GET |
|
| 237 | 237 | * @param bool $xss_clean Whether to apply XSS filtering |
| 238 | 238 | * @return mixed |
| 239 | 239 | */ |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | /** |
| 248 | 248 | * Fetch an item from the POST array |
| 249 | 249 | * |
| 250 | - * @param mixed $index Index for item to be fetched from $_POST |
|
| 250 | + * @param string $index Index for item to be fetched from $_POST |
|
| 251 | 251 | * @param bool $xss_clean Whether to apply XSS filtering |
| 252 | 252 | * @return mixed |
| 253 | 253 | */ |
@@ -307,9 +307,9 @@ discard block |
||
| 307 | 307 | /** |
| 308 | 308 | * Fetch an item from the SERVER array |
| 309 | 309 | * |
| 310 | - * @param mixed $index Index for item to be fetched from $_SERVER |
|
| 310 | + * @param string $index Index for item to be fetched from $_SERVER |
|
| 311 | 311 | * @param bool $xss_clean Whether to apply XSS filtering |
| 312 | - * @return mixed |
|
| 312 | + * @return string |
|
| 313 | 313 | */ |
| 314 | 314 | public function server($index, $xss_clean = NULL) |
| 315 | 315 | { |
@@ -877,7 +877,7 @@ discard block |
||
| 877 | 877 | * Allows read access to protected properties |
| 878 | 878 | * |
| 879 | 879 | * @param string $name |
| 880 | - * @return mixed |
|
| 880 | + * @return string|null |
|
| 881 | 881 | */ |
| 882 | 882 | public function __get($name) |
| 883 | 883 | { |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | * @param string $library Library name |
| 186 | 186 | * @param array $params Optional parameters to pass to the library class constructor |
| 187 | 187 | * @param string $object_name An optional object name to assign to |
| 188 | - * @return object |
|
| 188 | + * @return CI_Loader |
|
| 189 | 189 | */ |
| 190 | 190 | public function library($library, $params = NULL, $object_name = NULL) |
| 191 | 191 | { |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | * @param string $model Model name |
| 230 | 230 | * @param string $name An optional object name to assign to |
| 231 | 231 | * @param bool $db_conn An optional database connection configuration to initialize |
| 232 | - * @return object |
|
| 232 | + * @return CI_Loader |
|
| 233 | 233 | */ |
| 234 | 234 | public function model($model, $name = '', $db_conn = FALSE) |
| 235 | 235 | { |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | /** |
| 330 | 330 | * Database Loader |
| 331 | 331 | * |
| 332 | - * @param mixed $params Database configuration options |
|
| 332 | + * @param string|boolean $params Database configuration options |
|
| 333 | 333 | * @param bool $return Whether to return the database object |
| 334 | 334 | * @param bool $query_builder Whether to enable Query Builder |
| 335 | 335 | * (overrides the configuration setting) |
@@ -485,7 +485,7 @@ discard block |
||
| 485 | 485 | * An associative array or object containing values |
| 486 | 486 | * to be set, or a value's name if string |
| 487 | 487 | * @param string $val Value to set, only used if $vars is a string |
| 488 | - * @return object |
|
| 488 | + * @return CI_Loader |
|
| 489 | 489 | */ |
| 490 | 490 | public function vars($vars, $val = '') |
| 491 | 491 | { |
@@ -557,7 +557,7 @@ discard block |
||
| 557 | 557 | * Helper Loader |
| 558 | 558 | * |
| 559 | 559 | * @param string|string[] $helpers Helper name(s) |
| 560 | - * @return object |
|
| 560 | + * @return CI_Loader |
|
| 561 | 561 | */ |
| 562 | 562 | public function helper($helpers = array()) |
| 563 | 563 | { |
@@ -628,7 +628,7 @@ discard block |
||
| 628 | 628 | * |
| 629 | 629 | * @uses CI_Loader::helper() |
| 630 | 630 | * @param string|string[] $helpers Helper name(s) |
| 631 | - * @return object |
|
| 631 | + * @return CI_Loader |
|
| 632 | 632 | */ |
| 633 | 633 | public function helpers($helpers = array()) |
| 634 | 634 | { |
@@ -644,7 +644,7 @@ discard block |
||
| 644 | 644 | * |
| 645 | 645 | * @param string|string[] $files List of language file names to load |
| 646 | 646 | * @param string Language name |
| 647 | - * @return object |
|
| 647 | + * @return CI_Loader |
|
| 648 | 648 | */ |
| 649 | 649 | public function language($files, $lang = '') |
| 650 | 650 | { |
@@ -731,7 +731,7 @@ discard block |
||
| 731 | 731 | * |
| 732 | 732 | * @param string $path Path to add |
| 733 | 733 | * @param bool $view_cascade (default: TRUE) |
| 734 | - * @return object |
|
| 734 | + * @return CI_Loader |
|
| 735 | 735 | */ |
| 736 | 736 | public function add_package_path($path, $view_cascade = TRUE) |
| 737 | 737 | { |
@@ -775,7 +775,7 @@ discard block |
||
| 775 | 775 | * added path will be removed removed. |
| 776 | 776 | * |
| 777 | 777 | * @param string $path Path to remove |
| 778 | - * @return object |
|
| 778 | + * @return CI_Loader |
|
| 779 | 779 | */ |
| 780 | 780 | public function remove_package_path($path = '') |
| 781 | 781 | { |
@@ -1061,7 +1061,7 @@ discard block |
||
| 1061 | 1061 | * @used-by CI_Loader::_ci_load_library() |
| 1062 | 1062 | * @uses CI_Loader::_ci_init_library() |
| 1063 | 1063 | * |
| 1064 | - * @param string $library Library name to load |
|
| 1064 | + * @param string $library_name Library name to load |
|
| 1065 | 1065 | * @param string $file_path Path to the library filename, relative to libraries/ |
| 1066 | 1066 | * @param mixed $params Optional parameters to pass to the class constructor |
| 1067 | 1067 | * @param string $object_name Optional object name to assign to |
@@ -285,7 +285,7 @@ |
||
| 285 | 285 | /** |
| 286 | 286 | * Get Header |
| 287 | 287 | * |
| 288 | - * @param string $header_name |
|
| 288 | + * @param string $header |
|
| 289 | 289 | * @return string |
| 290 | 290 | */ |
| 291 | 291 | public function get_header($header) |
@@ -69,6 +69,7 @@ |
||
| 69 | 69 | * Constructor |
| 70 | 70 | * |
| 71 | 71 | * @param object &$db |
| 72 | + * @param CI_DB_driver $db |
|
| 72 | 73 | * @return void |
| 73 | 74 | */ |
| 74 | 75 | public function __construct(&$db) |
@@ -372,7 +372,7 @@ |
||
| 372 | 372 | * @param string $table Table name |
| 373 | 373 | * @param bool $if_not_exists Whether to add 'IF NOT EXISTS' condition |
| 374 | 374 | * @param array $attributes Associative array of table attributes |
| 375 | - * @return mixed |
|
| 375 | + * @return boolean|string |
|
| 376 | 376 | */ |
| 377 | 377 | protected function _create_table($table, $if_not_exists, $attributes) |
| 378 | 378 | { |
@@ -452,7 +452,7 @@ discard block |
||
| 452 | 452 | * |
| 453 | 453 | * Generates the FROM portion of the query |
| 454 | 454 | * |
| 455 | - * @param mixed $from can be a string or array |
|
| 455 | + * @param string $from can be a string or array |
|
| 456 | 456 | * @return CI_DB_query_builder |
| 457 | 457 | */ |
| 458 | 458 | public function from($from) |
@@ -595,6 +595,8 @@ discard block |
||
| 595 | 595 | * @param mixed |
| 596 | 596 | * @param mixed |
| 597 | 597 | * @param bool |
| 598 | + * @param integer $value |
|
| 599 | + * @param boolean $escape |
|
| 598 | 600 | * @return CI_DB_query_builder |
| 599 | 601 | */ |
| 600 | 602 | public function where($key, $value = NULL, $escape = NULL) |
@@ -1138,7 +1140,7 @@ discard block |
||
| 1138 | 1140 | * @param string $key |
| 1139 | 1141 | * @param string $value |
| 1140 | 1142 | * @param bool $escape |
| 1141 | - * @return object |
|
| 1143 | + * @return CI_DB_query_builder |
|
| 1142 | 1144 | */ |
| 1143 | 1145 | public function having($key, $value = NULL, $escape = NULL) |
| 1144 | 1146 | { |
@@ -1155,7 +1157,7 @@ discard block |
||
| 1155 | 1157 | * @param string $key |
| 1156 | 1158 | * @param string $value |
| 1157 | 1159 | * @param bool $escape |
| 1158 | - * @return object |
|
| 1160 | + * @return CI_DB_query_builder |
|
| 1159 | 1161 | */ |
| 1160 | 1162 | public function or_having($key, $value = NULL, $escape = NULL) |
| 1161 | 1163 | { |
@@ -1277,6 +1279,7 @@ discard block |
||
| 1277 | 1279 | * @param mixed |
| 1278 | 1280 | * @param string |
| 1279 | 1281 | * @param bool |
| 1282 | + * @param boolean $escape |
|
| 1280 | 1283 | * @return CI_DB_query_builder |
| 1281 | 1284 | */ |
| 1282 | 1285 | public function set($key, $value = '', $escape = NULL) |
@@ -1504,6 +1507,7 @@ discard block |
||
| 1504 | 1507 | * @param mixed |
| 1505 | 1508 | * @param string |
| 1506 | 1509 | * @param bool |
| 1510 | + * @param boolean $escape |
|
| 1507 | 1511 | * @return CI_DB_query_builder |
| 1508 | 1512 | */ |
| 1509 | 1513 | public function set_insert_batch($key, $value = '', $escape = NULL) |
@@ -1704,6 +1708,7 @@ discard block |
||
| 1704 | 1708 | * @param string the table name |
| 1705 | 1709 | * @param array the insert keys |
| 1706 | 1710 | * @param array the insert values |
| 1711 | + * @param string $table |
|
| 1707 | 1712 | * @return string |
| 1708 | 1713 | */ |
| 1709 | 1714 | protected function _replace($table, $keys, $values) |
@@ -1812,7 +1817,8 @@ discard block |
||
| 1812 | 1817 | * chosen to be update. |
| 1813 | 1818 | * |
| 1814 | 1819 | * @param string the table to update data on |
| 1815 | - * @return bool |
|
| 1820 | + * @param string $table |
|
| 1821 | + * @return string|boolean |
|
| 1816 | 1822 | */ |
| 1817 | 1823 | protected function _validate_update($table) |
| 1818 | 1824 | { |