summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-02-05 14:31:08 +0100
committerAndrey Andreev <narf@devilix.net>2015-02-05 14:31:08 +0100
commit79533cac482a9d8f9211c8ff607968de3b27d1e4 (patch)
treef3cbaf44b6cf7cab075f4cc5f388bd1c3ecabd79 /system/libraries
parent74d0e23eae054c49bbf7d9d5c4738fa5a63754cf (diff)
parent40bbd60bcc5135f898f46e502f7b04ef065274e0 (diff)
Merge pull request #3551 from gadelat/voids
Fixed inconsistent return types
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Encryption.php2
-rw-r--r--system/libraries/Migration.php4
-rw-r--r--system/libraries/Session/drivers/Session_database_driver.php2
-rw-r--r--system/libraries/Session/drivers/Session_files_driver.php2
-rw-r--r--system/libraries/Session/drivers/Session_memcached_driver.php2
-rw-r--r--system/libraries/Session/drivers/Session_redis_driver.php2
-rw-r--r--system/libraries/Table.php2
-rw-r--r--system/libraries/Xmlrpc.php1
8 files changed, 9 insertions, 8 deletions
diff --git a/system/libraries/Encryption.php b/system/libraries/Encryption.php
index fad4ea7f8..e3e68139a 100644
--- a/system/libraries/Encryption.php
+++ b/system/libraries/Encryption.php
@@ -160,7 +160,7 @@ class CI_Encryption {
if ( ! $this->_drivers['mcrypt'] && ! $this->_drivers['openssl'])
{
- return show_error('Encryption: Unable to find an available encryption driver.');
+ show_error('Encryption: Unable to find an available encryption driver.');
}
isset(self::$func_override) OR self::$func_override = (extension_loaded('mbstring') && ini_get('mbstring.func_override'));
diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php
index 8ce4243fe..ae36a3b45 100644
--- a/system/libraries/Migration.php
+++ b/system/libraries/Migration.php
@@ -421,11 +421,11 @@ class CI_Migration {
* Stores the current schema version
*
* @param string $migration Migration reached
- * @return void Outputs a report of the migration
+ * @return void
*/
protected function _update_version($migration)
{
- return $this->db->update($this->_migration_table, array(
+ $this->db->update($this->_migration_table, array(
'version' => $migration
));
}
diff --git a/system/libraries/Session/drivers/Session_database_driver.php b/system/libraries/Session/drivers/Session_database_driver.php
index 0ec6e34f0..20cec00fd 100644
--- a/system/libraries/Session/drivers/Session_database_driver.php
+++ b/system/libraries/Session/drivers/Session_database_driver.php
@@ -252,7 +252,7 @@ class CI_Session_database_driver extends CI_Session_driver implements SessionHan
*
* Releases locks
*
- * @return void
+ * @return bool
*/
public function close()
{
diff --git a/system/libraries/Session/drivers/Session_files_driver.php b/system/libraries/Session/drivers/Session_files_driver.php
index ad8315d52..d3ef34acd 100644
--- a/system/libraries/Session/drivers/Session_files_driver.php
+++ b/system/libraries/Session/drivers/Session_files_driver.php
@@ -269,7 +269,7 @@ class CI_Session_files_driver extends CI_Session_driver implements SessionHandle
*
* Releases locks and closes file descriptor.
*
- * @return void
+ * @return bool
*/
public function close()
{
diff --git a/system/libraries/Session/drivers/Session_memcached_driver.php b/system/libraries/Session/drivers/Session_memcached_driver.php
index 00112c88c..600b8ca66 100644
--- a/system/libraries/Session/drivers/Session_memcached_driver.php
+++ b/system/libraries/Session/drivers/Session_memcached_driver.php
@@ -229,7 +229,7 @@ class CI_Session_memcached_driver extends CI_Session_driver implements SessionHa
*
* Releases locks and closes connection.
*
- * @return void
+ * @return bool
*/
public function close()
{
diff --git a/system/libraries/Session/drivers/Session_redis_driver.php b/system/libraries/Session/drivers/Session_redis_driver.php
index c53975ae4..c3c75b3b6 100644
--- a/system/libraries/Session/drivers/Session_redis_driver.php
+++ b/system/libraries/Session/drivers/Session_redis_driver.php
@@ -230,7 +230,7 @@ class CI_Session_redis_driver extends CI_Session_driver implements SessionHandle
*
* Releases locks and closes connection.
*
- * @return void
+ * @return bool
*/
public function close()
{
diff --git a/system/libraries/Table.php b/system/libraries/Table.php
index 7a39dfc77..2d9823093 100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
@@ -502,7 +502,7 @@ class CI_Table {
/**
* Default Template
*
- * @return void
+ * @return array
*/
protected function _default_template()
{
diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php
index 9d7cbffa2..8fbc18f04 100644
--- a/system/libraries/Xmlrpc.php
+++ b/system/libraries/Xmlrpc.php
@@ -1792,6 +1792,7 @@ class XML_RPC_Values extends CI_Xmlrpc
*
* @param string
* @param mixed
+ * @return string
*/
public function serializedata($typ, $val)
{