diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-11-29 23:17:58 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-11-29 23:17:58 +0100 |
| commit | 5d783464538807ef68f34d83d963af9e93a7268b (patch) | |
| tree | 11406cd46cf3ea44d2a5eeb0606c7481d5a3c96f /phpBB/includes/cache | |
| parent | aa9aa28fa25677b6b1c1dc60d7c345c4786a14e0 (diff) | |
| parent | b2a252d2748be0f18901db5fc0294566af04a2dc (diff) | |
| download | forums-5d783464538807ef68f34d83d963af9e93a7268b.tar forums-5d783464538807ef68f34d83d963af9e93a7268b.tar.gz forums-5d783464538807ef68f34d83d963af9e93a7268b.tar.bz2 forums-5d783464538807ef68f34d83d963af9e93a7268b.tar.xz forums-5d783464538807ef68f34d83d963af9e93a7268b.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11227] @return void -> @return null in develop-olympus.
Diffstat (limited to 'phpBB/includes/cache')
| -rw-r--r-- | phpBB/includes/cache/driver/apc.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/cache/driver/eaccelerator.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/cache/driver/memcache.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/cache/driver/redis.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/cache/driver/wincache.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/cache/driver/xcache.php | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/includes/cache/driver/apc.php b/phpBB/includes/cache/driver/apc.php index dc0144fac3..0516b669c8 100644 --- a/phpBB/includes/cache/driver/apc.php +++ b/phpBB/includes/cache/driver/apc.php @@ -26,7 +26,7 @@ class phpbb_cache_driver_apc extends phpbb_cache_driver_memory /** * Purge cache data * - * @return void + * @return null */ function purge() { diff --git a/phpBB/includes/cache/driver/eaccelerator.php b/phpBB/includes/cache/driver/eaccelerator.php index 7939f043c9..257b90c76e 100644 --- a/phpBB/includes/cache/driver/eaccelerator.php +++ b/phpBB/includes/cache/driver/eaccelerator.php @@ -30,7 +30,7 @@ class phpbb_cache_driver_eaccelerator extends phpbb_cache_driver_memory /** * Purge cache data * - * @return void + * @return null */ function purge() { @@ -47,7 +47,7 @@ class phpbb_cache_driver_eaccelerator extends phpbb_cache_driver_memory /** * Perform cache garbage collection * - * @return void + * @return null */ function tidy() { diff --git a/phpBB/includes/cache/driver/memcache.php b/phpBB/includes/cache/driver/memcache.php index 9fe70f8b44..3fd16b23b0 100644 --- a/phpBB/includes/cache/driver/memcache.php +++ b/phpBB/includes/cache/driver/memcache.php @@ -64,7 +64,7 @@ class phpbb_cache_driver_memcache extends phpbb_cache_driver_memory /** * Unload the cache resources * - * @return void + * @return null */ function unload() { @@ -76,7 +76,7 @@ class phpbb_cache_driver_memcache extends phpbb_cache_driver_memory /** * Purge cache data * - * @return void + * @return null */ function purge() { diff --git a/phpBB/includes/cache/driver/redis.php b/phpBB/includes/cache/driver/redis.php index a768885962..d256b5600e 100644 --- a/phpBB/includes/cache/driver/redis.php +++ b/phpBB/includes/cache/driver/redis.php @@ -74,7 +74,7 @@ class phpbb_cache_driver_redis extends phpbb_cache_driver_memory /** * Unload the cache resources * - * @return void + * @return null */ function unload() { @@ -86,7 +86,7 @@ class phpbb_cache_driver_redis extends phpbb_cache_driver_memory /** * Purge cache data * - * @return void + * @return null */ function purge() { diff --git a/phpBB/includes/cache/driver/wincache.php b/phpBB/includes/cache/driver/wincache.php index fa9eb95f88..58f3b4a581 100644 --- a/phpBB/includes/cache/driver/wincache.php +++ b/phpBB/includes/cache/driver/wincache.php @@ -26,7 +26,7 @@ class phpbb_cache_driver_wincache extends phpbb_cache_driver_memory /** * Purge cache data * - * @return void + * @return null */ function purge() { diff --git a/phpBB/includes/cache/driver/xcache.php b/phpBB/includes/cache/driver/xcache.php index 0b768bdb3e..06c5fafd97 100644 --- a/phpBB/includes/cache/driver/xcache.php +++ b/phpBB/includes/cache/driver/xcache.php @@ -41,7 +41,7 @@ class phpbb_cache_driver_xcache extends phpbb_cache_driver_memory /** * Purge cache data * - * @return void + * @return null */ function purge() { |