summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-06-05 09:44:37 +0200
committerGitHub <noreply@github.com>2017-06-05 09:44:37 +0200
commit735e2165d1ad16454ae1b2222a66345a74b82d14 (patch)
tree4c3ee78046cb48080b2e4c1cfad8495979260bb9 /system/libraries
parentfdd4b816c8bb8c072e98a586b0b41786dd34d44c (diff)
parentdec2b56fa44803e1579804fe329fd45658c6217b (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 5313de04c..2aeb77267 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 dc309890b..ba096836b 100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
@@ -436,7 +436,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)