Merge "Remove return of void method results"

diff --git a/includes/StubObject.php b/includes/StubObject.php
index 2dfcdc2..49155d6 100644 (file)
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -194,7 +194,7 @@ class StubUserLang extends StubObject {
        public function findVariantLink( &$link, &$nt, $ignoreOtherCond = false ) {
                global $wgLang;
                $this->_unstub( 'findVariantLink', 3 );
-               return $wgLang->findVariantLink( $link, $nt, $ignoreOtherCond );
+               $wgLang->findVariantLink( $link, $nt, $ignoreOtherCond );
        }
 
        /**

diff --git a/includes/api/ApiResult.php b/includes/api/ApiResult.php
index 608e9e1..142a780 100644 (file)
--- a/includes/api/ApiResult.php
+++ b/includes/api/ApiResult.php
@@ -1277,7 +1277,7 @@ class ApiResult implements ApiSerializable {
         */
        public static function setElement( &$arr, $name, $value, $flags = 0 ) {
                wfDeprecated( __METHOD__, '1.25' );
-               return self::setValue( $arr, $name, $value, $flags );
+               self::setValue( $arr, $name, $value, $flags );
        }
 
        /**

diff --git a/includes/clientpool/RedisConnectionPool.php b/includes/clientpool/RedisConnectionPool.php
index 117bd2d..ec0573e 100644 (file)
--- a/includes/clientpool/RedisConnectionPool.php
+++ b/includes/clientpool/RedisConnectionPool.php
@@ -331,7 +331,7 @@ class RedisConnectionPool implements LoggerAwareInterface {
         * @deprecated since 1.23
         */
        public function handleException( $server, RedisConnRef $cref, RedisException $e ) {
-               return $this->handleError( $cref, $e );
+               $this->handleError( $cref, $e );
        }
 
        /**

diff --git a/includes/utils/iterators/IteratorDecorator.php b/includes/utils/iterators/IteratorDecorator.php
index 288a311..c1b5020 100644 (file)
--- a/includes/utils/iterators/IteratorDecorator.php
+++ b/includes/utils/iterators/IteratorDecorator.php
@@ -37,11 +37,11 @@ abstract class IteratorDecorator implements Iterator {
        }
 
        public function next() {
-               return $this->iterator->next();
+               $this->iterator->next();
        }
 
        public function rewind() {
-               return $this->iterator->rewind();
+               $this->iterator->rewind();
        }
 
        public function valid() {