aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-11-30 23:03:06 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2012-11-30 23:03:06 -0500
commitec4343c7447911c7e822a03c0f57fc2bb1c4ab3d (patch)
treeca50b41e53de1e948cb2ee9859a4b69b530305ba
parent3a702084e4249830a87dc0914127e00c1bb1b1dd (diff)
downloadforums-ec4343c7447911c7e822a03c0f57fc2bb1c4ab3d.tar
forums-ec4343c7447911c7e822a03c0f57fc2bb1c4ab3d.tar.gz
forums-ec4343c7447911c7e822a03c0f57fc2bb1c4ab3d.tar.bz2
forums-ec4343c7447911c7e822a03c0f57fc2bb1c4ab3d.tar.xz
forums-ec4343c7447911c7e822a03c0f57fc2bb1c4ab3d.zip
[ticket/11227] @return void -> @return null, per coding guidelines.
PHPBB3-11227
-rw-r--r--phpBB/includes/config/config.php2
-rw-r--r--phpBB/includes/config/db.php2
-rw-r--r--phpBB/includes/cron/manager.php2
-rw-r--r--phpBB/includes/cron/task/core/prune_all_forums.php2
-rw-r--r--phpBB/includes/cron/task/core/prune_forum.php4
-rw-r--r--phpBB/includes/cron/task/core/queue.php2
-rw-r--r--phpBB/includes/cron/task/core/tidy_cache.php2
-rw-r--r--phpBB/includes/cron/task/core/tidy_database.php2
-rw-r--r--phpBB/includes/cron/task/core/tidy_search.php2
-rw-r--r--phpBB/includes/cron/task/core/tidy_sessions.php2
-rw-r--r--phpBB/includes/cron/task/core/tidy_warnings.php2
-rw-r--r--phpBB/includes/cron/task/parametrized.php2
-rw-r--r--phpBB/includes/cron/task/task.php2
-rw-r--r--phpBB/includes/functions_download.php2
-rw-r--r--phpBB/includes/group_positions.php10
-rw-r--r--phpBB/includes/lock/db.php2
-rw-r--r--phpBB/includes/style/resource_locator.php4
-rw-r--r--phpBB/includes/template/compile.php2
18 files changed, 24 insertions, 24 deletions
diff --git a/phpBB/includes/config/config.php b/phpBB/includes/config/config.php
index 12a4a418b2..4b533dd55c 100644
--- a/phpBB/includes/config/config.php
+++ b/phpBB/includes/config/config.php
@@ -109,7 +109,7 @@ class phpbb_config implements ArrayAccess, IteratorAggregate, Countable
* @param String $key The configuration option's name
* @param bool $use_cache Whether this variable should be cached or if it
* changes too frequently to be efficiently cached
- * @return void
+ * @return null
*/
public function delete($key, $use_cache = true)
{
diff --git a/phpBB/includes/config/db.php b/phpBB/includes/config/db.php
index 993a764a7f..45f9f1cb21 100644
--- a/phpBB/includes/config/db.php
+++ b/phpBB/includes/config/db.php
@@ -96,7 +96,7 @@ class phpbb_config_db extends phpbb_config
* @param String $key The configuration option's name
* @param bool $use_cache Whether this variable should be cached or if it
* changes too frequently to be efficiently cached
- * @return void
+ * @return null
*/
public function delete($key, $use_cache = true)
{
diff --git a/phpBB/includes/cron/manager.php b/phpBB/includes/cron/manager.php
index ccaa4f3764..84c9650830 100644
--- a/phpBB/includes/cron/manager.php
+++ b/phpBB/includes/cron/manager.php
@@ -54,7 +54,7 @@ class phpbb_cron_manager
*
* @param array|Traversable $tasks Array of instances of phpbb_cron_task
*
- * @return void
+ * @return null
*/
public function load_tasks($tasks)
{
diff --git a/phpBB/includes/cron/task/core/prune_all_forums.php b/phpBB/includes/cron/task/core/prune_all_forums.php
index 252e16e57d..ee0b5f7626 100644
--- a/phpBB/includes/cron/task/core/prune_all_forums.php
+++ b/phpBB/includes/cron/task/core/prune_all_forums.php
@@ -50,7 +50,7 @@ class phpbb_cron_task_core_prune_all_forums extends phpbb_cron_task_base
/**
* Runs this cron task.
*
- * @return void
+ * @return null
*/
public function run()
{
diff --git a/phpBB/includes/cron/task/core/prune_forum.php b/phpBB/includes/cron/task/core/prune_forum.php
index 41d60af921..fa7a761d88 100644
--- a/phpBB/includes/cron/task/core/prune_forum.php
+++ b/phpBB/includes/cron/task/core/prune_forum.php
@@ -70,7 +70,7 @@ class phpbb_cron_task_core_prune_forum extends phpbb_cron_task_base implements p
/**
* Runs this cron task.
*
- * @return void
+ * @return null
*/
public function run()
{
@@ -138,7 +138,7 @@ class phpbb_cron_task_core_prune_forum extends phpbb_cron_task_base implements p
*
* @param phpbb_request_interface $request Request object.
*
- * @return void
+ * @return null
*/
public function parse_parameters(phpbb_request_interface $request)
{
diff --git a/phpBB/includes/cron/task/core/queue.php b/phpBB/includes/cron/task/core/queue.php
index c765660906..732f9c6bea 100644
--- a/phpBB/includes/cron/task/core/queue.php
+++ b/phpBB/includes/cron/task/core/queue.php
@@ -43,7 +43,7 @@ class phpbb_cron_task_core_queue extends phpbb_cron_task_base
/**
* Runs this cron task.
*
- * @return void
+ * @return null
*/
public function run()
{
diff --git a/phpBB/includes/cron/task/core/tidy_cache.php b/phpBB/includes/cron/task/core/tidy_cache.php
index 6017eea561..16a45dae7c 100644
--- a/phpBB/includes/cron/task/core/tidy_cache.php
+++ b/phpBB/includes/cron/task/core/tidy_cache.php
@@ -40,7 +40,7 @@ class phpbb_cron_task_core_tidy_cache extends phpbb_cron_task_base
/**
* Runs this cron task.
*
- * @return void
+ * @return null
*/
public function run()
{
diff --git a/phpBB/includes/cron/task/core/tidy_database.php b/phpBB/includes/cron/task/core/tidy_database.php
index 1d256f964f..b882e7b500 100644
--- a/phpBB/includes/cron/task/core/tidy_database.php
+++ b/phpBB/includes/cron/task/core/tidy_database.php
@@ -43,7 +43,7 @@ class phpbb_cron_task_core_tidy_database extends phpbb_cron_task_base
/**
* Runs this cron task.
*
- * @return void
+ * @return null
*/
public function run()
{
diff --git a/phpBB/includes/cron/task/core/tidy_search.php b/phpBB/includes/cron/task/core/tidy_search.php
index 2e5f3d79d5..fdbe31346e 100644
--- a/phpBB/includes/cron/task/core/tidy_search.php
+++ b/phpBB/includes/cron/task/core/tidy_search.php
@@ -54,7 +54,7 @@ class phpbb_cron_task_core_tidy_search extends phpbb_cron_task_base
/**
* Runs this cron task.
*
- * @return void
+ * @return null
*/
public function run()
{
diff --git a/phpBB/includes/cron/task/core/tidy_sessions.php b/phpBB/includes/cron/task/core/tidy_sessions.php
index 13531aa30b..95f55235c9 100644
--- a/phpBB/includes/cron/task/core/tidy_sessions.php
+++ b/phpBB/includes/cron/task/core/tidy_sessions.php
@@ -40,7 +40,7 @@ class phpbb_cron_task_core_tidy_sessions extends phpbb_cron_task_base
/**
* Runs this cron task.
*
- * @return void
+ * @return null
*/
public function run()
{
diff --git a/phpBB/includes/cron/task/core/tidy_warnings.php b/phpBB/includes/cron/task/core/tidy_warnings.php
index 8dd0674fe5..2a7798e56e 100644
--- a/phpBB/includes/cron/task/core/tidy_warnings.php
+++ b/phpBB/includes/cron/task/core/tidy_warnings.php
@@ -45,7 +45,7 @@ class phpbb_cron_task_core_tidy_warnings extends phpbb_cron_task_base
/**
* Runs this cron task.
*
- * @return void
+ * @return null
*/
public function run()
{
diff --git a/phpBB/includes/cron/task/parametrized.php b/phpBB/includes/cron/task/parametrized.php
index 0714b2e701..5f0e46eafc 100644
--- a/phpBB/includes/cron/task/parametrized.php
+++ b/phpBB/includes/cron/task/parametrized.php
@@ -46,7 +46,7 @@ interface phpbb_cron_task_parametrized extends phpbb_cron_task
*
* @param phpbb_request_interface $request Request object.
*
- * @return void
+ * @return null
*/
public function parse_parameters(phpbb_request_interface $request);
}
diff --git a/phpBB/includes/cron/task/task.php b/phpBB/includes/cron/task/task.php
index 7b08fed413..2d585df96d 100644
--- a/phpBB/includes/cron/task/task.php
+++ b/phpBB/includes/cron/task/task.php
@@ -31,7 +31,7 @@ interface phpbb_cron_task
/**
* Runs this cron task.
*
- * @return void
+ * @return null
*/
public function run();
diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php
index b6371dbecc..fc6f1cc762 100644
--- a/phpBB/includes/functions_download.php
+++ b/phpBB/includes/functions_download.php
@@ -433,7 +433,7 @@ function set_modified_headers($stamp, $browser)
*
* @param bool $exit Whether to die or not.
*
-* @return void
+* @return null
*/
function file_gc($exit = true)
{
diff --git a/phpBB/includes/group_positions.php b/phpBB/includes/group_positions.php
index 74de3516cb..60352ed97d 100644
--- a/phpBB/includes/group_positions.php
+++ b/phpBB/includes/group_positions.php
@@ -104,7 +104,7 @@ class phpbb_group_positions
* Addes a group by group_id
*
* @param int $group_id group_id of the group to be added
- * @return void
+ * @return null
*/
public function add_group($group_id)
{
@@ -128,7 +128,7 @@ class phpbb_group_positions
*
* @param int $group_id group_id of the group to be deleted
* @param bool $skip_group Skip setting the group to GROUP_DISABLED, to save the query, when you need to update it anyway.
- * @return void
+ * @return null
*/
public function delete_group($group_id, $skip_group = false)
{
@@ -159,7 +159,7 @@ class phpbb_group_positions
* Moves a group up by group_id
*
* @param int $group_id group_id of the group to be moved
- * @return void
+ * @return null
*/
public function move_up($group_id)
{
@@ -170,7 +170,7 @@ class phpbb_group_positions
* Moves a group down by group_id
*
* @param int $group_id group_id of the group to be moved
- * @return void
+ * @return null
*/
public function move_down($group_id)
{
@@ -184,7 +184,7 @@ class phpbb_group_positions
* @param int $delta number of steps:
* - positive = move up
* - negative = move down
- * @return void
+ * @return null
*/
public function move($group_id, $delta)
{
diff --git a/phpBB/includes/lock/db.php b/phpBB/includes/lock/db.php
index fa559d6887..6e94dd5a85 100644
--- a/phpBB/includes/lock/db.php
+++ b/phpBB/includes/lock/db.php
@@ -125,7 +125,7 @@ class phpbb_lock_db
* Note: Attempting to release a lock that is already released,
* that is, calling release() multiple times, is harmless.
*
- * @return void
+ * @return null
*/
public function release()
{
diff --git a/phpBB/includes/style/resource_locator.php b/phpBB/includes/style/resource_locator.php
index 04beddb434..4cf767c062 100644
--- a/phpBB/includes/style/resource_locator.php
+++ b/phpBB/includes/style/resource_locator.php
@@ -110,7 +110,7 @@ class phpbb_style_resource_locator implements phpbb_template_locator
* Typically it is one directory level deep, e.g. "template/".
*
* @param string $template_path Relative path to templates directory within style directories
- * @return void
+ * @return null
*/
public function set_template_path($template_path)
{
@@ -121,7 +121,7 @@ class phpbb_style_resource_locator implements phpbb_template_locator
* Sets the location of templates directory within style directories
* to the default, which is "template/".
*
- * @return void
+ * @return null
*/
public function set_default_template_path()
{
diff --git a/phpBB/includes/template/compile.php b/phpBB/includes/template/compile.php
index 82b301c1a2..d0b3d0f115 100644
--- a/phpBB/includes/template/compile.php
+++ b/phpBB/includes/template/compile.php
@@ -118,7 +118,7 @@ class phpbb_template_compile
*
* @param resource $source_stream Source stream
* @param resource $dest_stream Destination stream
- * @return void
+ * @return null
*/
private function compile_stream_to_stream($source_stream, $dest_stream)
{