summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel Potkány <gadelat@gmail.com>2015-02-04 01:45:59 +0100
committerGabriel Potkány <gadelat@gmail.com>2015-02-04 01:45:59 +0100
commit1fb500077784638399be79b32fe354aec257413c (patch)
tree0c8aacc26d8ee3d8113004c0f2a4882274a1efc9
parent9cec91be05e13f292f73e59dd08febf5e32859d8 (diff)
Fixed inconsistent return types
-rw-r--r--system/core/Common.php2
-rw-r--r--system/database/DB_driver.php2
-rw-r--r--system/database/DB_utility.php2
-rw-r--r--system/helpers/download_helper.php2
-rw-r--r--system/libraries/Encryption.php2
-rw-r--r--system/libraries/Migration.php2
-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--user_guide_src/source/database/utilities.rst2
12 files changed, 12 insertions, 12 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index c3198b31f..9f509745f 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -86,7 +86,7 @@ if ( ! function_exists('is_really_writable'))
*
* @link https://bugs.php.net/bug.php?id=54709
* @param string
- * @return void
+ * @return bool
*/
function is_really_writable($file)
{
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index a0803f170..bbe65b410 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -822,7 +822,7 @@ abstract class CI_DB_driver {
{
if ( ! $this->trans_enabled)
{
- return FALSE;
+ return;
}
// When transactions are nested we only begin/commit/rollback the outermost ones
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index 774d51533..ecfda522c 100644
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
@@ -316,7 +316,7 @@ abstract class CI_DB_utility {
* Database Backup
*
* @param array $params
- * @return void
+ * @return mixed
*/
public function backup($params = array())
{
diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index 379120552..2710a4ac7 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -59,7 +59,7 @@ if ( ! function_exists('force_download'))
* @param string filename
* @param mixed the data to be downloaded
* @param bool whether to try and send the actual file MIME type
- * @return void
+ * @return bool
*/
function force_download($filename = '', $data = '', $set_mime = FALSE)
{
diff --git a/system/libraries/Encryption.php b/system/libraries/Encryption.php
index 171a28b34..e4c668b6d 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..f61814988 100644
--- a/system/libraries/Migration.php
+++ b/system/libraries/Migration.php
@@ -421,7 +421,7 @@ class CI_Migration {
* Stores the current schema version
*
* @param string $migration Migration reached
- * @return void Outputs a report of the migration
+ * @return object Outputs a report of the migration
*/
protected function _update_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/user_guide_src/source/database/utilities.rst b/user_guide_src/source/database/utilities.rst
index 2da1f981d..7886be434 100644
--- a/user_guide_src/source/database/utilities.rst
+++ b/user_guide_src/source/database/utilities.rst
@@ -252,7 +252,7 @@ Class Reference
.. php:method:: backup([$params = array()])
:param array $params: An associative array of options
- :returns: void
+ :returns: mixed
:rtype: void
Perform a database backup, per user preferences.