From a2dc33a5a3b214e1e173d5d8abff8c2e29625549 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Sat, 17 Mar 2012 22:52:54 +0000 Subject: [PATCH] Trim trailing whitespace Add/improve documentation Explicitly define a few variables --- includes/objectcache/MemcachedClient.php | 34 ++++++++++++++++++++---- languages/Language.php | 2 +- languages/classes/LanguageKaa.php | 4 +-- tests/phpunit/languages/LanguageTest.php | 8 +++--- 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/includes/objectcache/MemcachedClient.php b/includes/objectcache/MemcachedClient.php index f8208f61da..4f49f7ddfb 100644 --- a/includes/objectcache/MemcachedClient.php +++ b/includes/objectcache/MemcachedClient.php @@ -344,11 +344,20 @@ class MWMemcached { return false; } + /** + * @param $key + * @param $timeout int + * @return bool + */ public function lock( $key, $timeout = 0 ) { /* stub */ return true; } + /** + * @param $key + * @return bool + */ public function unlock( $key ) { /* stub */ return true; @@ -471,7 +480,7 @@ class MWMemcached { $this->stats['get_multi'] = 1; } $sock_keys = array(); - + $socks = array(); foreach ( $keys as $key ) { $sock = $this->get_sock( $key ); if ( !is_resource( $sock ) ) { @@ -485,6 +494,7 @@ class MWMemcached { $sock_keys[$sock][] = $key; } + $gather = array(); // Send out the requests foreach ( $socks as $sock ) { $cmd = 'get'; @@ -579,6 +589,7 @@ class MWMemcached { return array(); } + $ret = array(); while ( true ) { $res = fgets( $sock ); $ret[] = $res; @@ -744,6 +755,9 @@ class MWMemcached { $this->_dead_host( $host ); } + /** + * @param $host + */ function _dead_host( $host ) { $parts = explode( ':', $host ); $ip = $parts[0]; @@ -774,8 +788,8 @@ class MWMemcached { } $hv = is_array( $key ) ? intval( $key[0] ) : $this->_hashfunc( $key ); - if ( $this->_buckets === null ) { + $bu = array(); foreach ( $this->_servers as $v ) { if ( is_array( $v ) ) { for( $i = 0; $i < $v[1]; $i++ ) { @@ -851,7 +865,8 @@ class MWMemcached { $this->stats[$cmd] = 1; } if ( !$this->_safe_fwrite( $sock, "$cmd $key $amt\r\n" ) ) { - return $this->_dead_sock( $sock ); + $this->_dead_sock( $sock ); + return null; } $line = fgets( $sock ); @@ -998,7 +1013,8 @@ class MWMemcached { } } if ( !$this->_safe_fwrite( $sock, "$cmd $key $flags $exp $len\r\n$val\r\n" ) ) { - return $this->_dead_sock( $sock ); + $this->_dead_sock( $sock ); + return false; } $line = trim( fgets( $sock ) ); @@ -1038,7 +1054,8 @@ class MWMemcached { } if ( !$this->_connect_sock( $sock, $host ) ) { - return $this->_dead_host( $host ); + $this->_dead_host( $host ); + return null; } // Do not buffer writes @@ -1049,6 +1066,9 @@ class MWMemcached { return $this->_cache_sock[$host]; } + /** + * @param $str string + */ function _debugprint( $str ) { print( $str ); } @@ -1080,6 +1100,9 @@ class MWMemcached { /** * Original behaviour + * @param $f + * @param $buf + * @param $len bool * @return int */ function _safe_fwrite( $f, $buf, $len = false ) { @@ -1093,6 +1116,7 @@ class MWMemcached { /** * Flush the read buffer of a stream + * @param $f Resource */ function _flush_read_buffer( $f ) { if ( !is_resource( $f ) ) { diff --git a/languages/Language.php b/languages/Language.php index 10fa4f64fe..facd39c9ae 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -3800,7 +3800,7 @@ class Language { /** * Decode an expiry (block, protection, etc) which has come from the DB - * + * * @FIXME: why are we returnings DBMS-dependent strings??? * * @param $expiry String: Database expiry String diff --git a/languages/classes/LanguageKaa.php b/languages/classes/LanguageKaa.php index a40fb7ae43..22e8946394 100644 --- a/languages/classes/LanguageKaa.php +++ b/languages/classes/LanguageKaa.php @@ -41,11 +41,11 @@ class LanguageKaa extends Language { } /** - * It fixes issue with lcfirst for transforming 'I' to 'ı' + * It fixes issue with lcfirst for transforming 'I' to 'ı' * * @param $string string * - * @return string + * @return mixed|string */ function lcfirst ( $string ) { if ( substr( $string, 0, 1 ) === 'I' ) { diff --git a/tests/phpunit/languages/LanguageTest.php b/tests/phpunit/languages/LanguageTest.php index 5b05962d7a..f31ab82229 100644 --- a/tests/phpunit/languages/LanguageTest.php +++ b/tests/phpunit/languages/LanguageTest.php @@ -23,12 +23,12 @@ class LanguageTest extends MediaWikiTestCase { 'convertDoubleWidth() with the full alphabet and digits' ); } - + /** @dataProvider provideFormattableTimes */ function testFormatTimePeriod( $seconds, $format, $expected, $desc ) { $this->assertEquals( $expected, $this->lang->formatTimePeriod( $seconds, $format ), $desc ); } - + function provideFormattableTimes() { return array( array( 9.45, array(), '9.5s', 'formatTimePeriod() rounding (<10s)' ), @@ -62,7 +62,7 @@ class LanguageTest extends MediaWikiTestCase { array( 176460.55, array(), '2d 1h 1m 1s', 'formatTimePeriod() rounding, recursion, (>48h)' ), array( 176460.55, array( 'noabbrevs' => true ), '2 days 1 hour 1 minute 1 second', 'formatTimePeriod() rounding, recursion, (>48h)' ), ); - + } function testTruncate() { @@ -224,7 +224,7 @@ class LanguageTest extends MediaWikiTestCase { "sprintfDate('$format', '$ts'): $msg" ); - date_default_timezone_set( $oldTZ ); + date_default_timezone_set( $oldTZ ); } function provideSprintfDateSamples() { -- 2.20.1