summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-06-05 09:44:37 +0200
committerAndrey Andreev <narf@devilix.net>2017-06-05 09:45:35 +0200
commitee9d428171dc201f51eaffdb62616312915681ff (patch)
treea27f7d05c362dafe6b901da2ed854e44f665502e /system/libraries
parentab0010f543d88fa19506907684a9d329d4dd94e3 (diff)
[ci skip] Merge pull request #5143 from TysonAndre/misc-phpdoc-nits
Fix misc inconsistencies between code and doc comments
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Session/drivers/Session_redis_driver.php2
-rw-r--r--system/libraries/Table.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Session/drivers/Session_redis_driver.php b/system/libraries/Session/drivers/Session_redis_driver.php
index d260f7b82..e220a2951 100644
--- a/system/libraries/Session/drivers/Session_redis_driver.php
+++ b/system/libraries/Session/drivers/Session_redis_driver.php
@@ -51,7 +51,7 @@ class CI_Session_redis_driver extends CI_Session_driver implements SessionHandle
/**
* phpRedis instance
*
- * @var resource
+ * @var Redis
*/
protected $_redis;
diff --git a/system/libraries/Table.php b/system/libraries/Table.php
index fef9bb039..50c5e358b 100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
@@ -435,7 +435,7 @@ class CI_Table {
/**
* Set table data from a database result object
*
- * @param CI_DB_result $db_result Database result object
+ * @param CI_DB_result $object Database result object
* @return void
*/
protected function _set_from_db_result($object)