Index: trunk/phase3/includes/EditPage.php |
— | — | @@ -169,7 +169,7 @@ |
170 | 170 | * Fetch initial editing page content. |
171 | 171 | * |
172 | 172 | * @param $def_text string |
173 | | - * @returns mixed string on success, $def_text for invalid sections |
| 173 | + * @return mixed string on success, $def_text for invalid sections |
174 | 174 | * @private |
175 | 175 | */ |
176 | 176 | function getContent( $def_text = '' ) { |
Index: trunk/phase3/includes/revisiondelete/RevisionDeleter.php |
— | — | @@ -65,10 +65,11 @@ |
66 | 66 | return $ret; |
67 | 67 | } |
68 | 68 | |
69 | | - // Get DB field name for URL param... |
70 | | - // Future code for other things may also track |
71 | | - // other types of revision-specific changes. |
72 | | - // @returns string One of log_id/rev_id/fa_id/ar_timestamp/oi_archive_name |
| 69 | + /** Get DB field name for URL param... |
| 70 | + * Future code for other things may also track |
| 71 | + * other types of revision-specific changes. |
| 72 | + * @return string One of log_id/rev_id/fa_id/ar_timestamp/oi_archive_name |
| 73 | + */ |
73 | 74 | public static function getRelationType( $typeName ) { |
74 | 75 | if ( isset( SpecialRevisionDelete::$deprecatedTypeMap[$typeName] ) ) { |
75 | 76 | $typeName = SpecialRevisionDelete::$deprecatedTypeMap[$typeName]; |
Index: trunk/phase3/includes/installer/WebInstallerPage.php |
— | — | @@ -122,7 +122,7 @@ |
123 | 123 | /** |
124 | 124 | * Get the end tag of a fieldset. |
125 | 125 | * |
126 | | - * @returns string |
| 126 | + * @return string |
127 | 127 | */ |
128 | 128 | protected function getFieldsetEnd() { |
129 | 129 | return "</fieldset>\n"; |
Index: trunk/phase3/includes/media/SVG.php |
— | — | @@ -119,7 +119,7 @@ |
120 | 120 | * @param string $dstPath |
121 | 121 | * @param string $width |
122 | 122 | * @param string $height |
123 | | - * @returns TRUE/MediaTransformError |
| 123 | + * @return true|MediaTransformError |
124 | 124 | */ |
125 | 125 | public function rasterize( $srcPath, $dstPath, $width, $height ) { |
126 | 126 | global $wgSVGConverters, $wgSVGConverter, $wgSVGConverterPath; |
Index: trunk/phase3/includes/HttpFunctions.php |
— | — | @@ -127,7 +127,7 @@ |
128 | 128 | * @fixme this is wildly inaccurate and fails to actually check most stuff |
129 | 129 | * |
130 | 130 | * @param $uri Mixed: URI to check for validity |
131 | | - * @returns Boolean |
| 131 | + * @return Boolean |
132 | 132 | */ |
133 | 133 | public static function isValidURI( $uri ) { |
134 | 134 | return preg_match( |
— | — | @@ -525,7 +525,7 @@ |
526 | 526 | /** |
527 | 527 | * Returns the cookie jar in use. |
528 | 528 | * |
529 | | - * @returns CookieJar |
| 529 | + * @return CookieJar |
530 | 530 | */ |
531 | 531 | public function getCookieJar() { |
532 | 532 | if ( !$this->respHeaders ) { |
— | — | @@ -571,7 +571,7 @@ |
572 | 572 | * Relative values of the "Location" header are incorrect as stated in RFC, however they do happen and modern browsers support them. |
573 | 573 | * This function loops backwards through all locations in order to build the proper absolute URI - Marooned at wikia-inc.com |
574 | 574 | * |
575 | | - * @returns string |
| 575 | + * @return string |
576 | 576 | */ |
577 | 577 | public function getFinalUrl() { |
578 | 578 | $headers = $this->getResponseHeaders(); |
Index: trunk/extensions/Configure/handler/HandlerDb.php |
— | — | @@ -82,7 +82,7 @@ |
83 | 83 | |
84 | 84 | /** |
85 | 85 | * Cache the data to the filesystem. |
86 | | - * @returns int bytes |
| 86 | + * @return int bytes |
87 | 87 | */ |
88 | 88 | protected function cacheToFS( $data ) { |
89 | 89 | global $wgConfigureFileSystemCache; |
Index: trunk/extensions/Blahtex/Blahtex.php |
— | — | @@ -244,7 +244,7 @@ |
245 | 245 | * blahtexOutputParser::parse() . |
246 | 246 | * @param $node Node in the tree that the message is stored |
247 | 247 | * under (string) |
248 | | - * @returns HTML fragment with the error message (string) |
| 248 | + * @return HTML fragment with the error message (string) |
249 | 249 | */ |
250 | 250 | function blahtexError( $results, $node ) { |
251 | 251 | $id = 'math_' . $results[$node . ":id"]; |
Index: trunk/extensions/SemanticProjectManagement/includes/SPM_WBS.php |
— | — | @@ -71,7 +71,7 @@ |
72 | 72 | * |
73 | 73 | * @param res SMWQueryResult, result set of the ask query provided by SMW |
74 | 74 | * @param outputmode ? |
75 | | - * @returns String, rendered HTML output of this printer for the ask-query |
| 75 | + * @return String, rendered HTML output of this printer for the ask-query |
76 | 76 | * |
77 | 77 | */ |
78 | 78 | protected function getResultText($res, $outputmode) { |
Index: trunk/extensions/SemanticProjectManagement/includes/SPM_GanttChart.php |
— | — | @@ -82,7 +82,7 @@ |
83 | 83 | * |
84 | 84 | * @param res SMWQueryResult, result set of the ask query provided by SMW |
85 | 85 | * @param outputmode ? |
86 | | - * @returns String, rendered HTML output of this printer for the ask-query |
| 86 | + * @return String, rendered HTML output of this printer for the ask-query |
87 | 87 | * |
88 | 88 | */ |
89 | 89 | protected function getResultText($res, $outputmode) { |
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter2.php |
— | — | @@ -197,7 +197,7 @@ |
198 | 198 | |
199 | 199 | /** |
200 | 200 | * Generates the donation footer ("There are other ways to give...") |
201 | | - * @returns string of HTML |
| 201 | + * @return string of HTML |
202 | 202 | */ |
203 | 203 | public function generateDonationFooter() { |
204 | 204 | global $wgScriptPath; |
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter3.php |
— | — | @@ -197,7 +197,7 @@ |
198 | 198 | |
199 | 199 | /** |
200 | 200 | * Generates the donation footer ("There are other ways to give...") |
201 | | - * @returns string of HTML |
| 201 | + * @return string of HTML |
202 | 202 | */ |
203 | 203 | public function generateDonationFooter() { |
204 | 204 | global $wgScriptPath; |
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter4.php |
— | — | @@ -197,7 +197,7 @@ |
198 | 198 | |
199 | 199 | /** |
200 | 200 | * Generates the donation footer ("There are other ways to give...") |
201 | | - * @returns string of HTML |
| 201 | + * @return string of HTML |
202 | 202 | */ |
203 | 203 | public function generateDonationFooter() { |
204 | 204 | global $wgScriptPath; |
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter5.php |
— | — | @@ -234,7 +234,7 @@ |
235 | 235 | |
236 | 236 | /** |
237 | 237 | * Generates the donation footer ("There are other ways to give...") |
238 | | - * @returns string of HTML |
| 238 | + * @return string of HTML |
239 | 239 | */ |
240 | 240 | public function generateDonationFooter() { |
241 | 241 | global $wgScriptPath; |
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter6.php |
— | — | @@ -250,7 +250,7 @@ |
251 | 251 | |
252 | 252 | /** |
253 | 253 | * Generates the donation footer ("There are other ways to give...") |
254 | | - * @returns string of HTML |
| 254 | + * @return string of HTML |
255 | 255 | */ |
256 | 256 | public function generateDonationFooter() { |
257 | 257 | global $wgScriptPath; |
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/Form.php |
— | — | @@ -115,7 +115,7 @@ |
116 | 116 | |
117 | 117 | /** |
118 | 118 | * Generates the donation footer ("There are other ways to give...") |
119 | | - * @returns string of HTML |
| 119 | + * @return string of HTML |
120 | 120 | */ |
121 | 121 | public function generateDonationFooter() { |
122 | 122 | global $wgScriptPath; |
Index: trunk/extensions/TitleBlacklist/TitleBlacklist.list.php |
— | — | @@ -432,7 +432,7 @@ |
433 | 433 | } |
434 | 434 | |
435 | 435 | /** |
436 | | - * @returns This entry's raw line |
| 436 | + * @return This entry's raw line |
437 | 437 | */ |
438 | 438 | public function getRaw() { |
439 | 439 | return $this->mRaw; |
Index: trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscode.php |
— | — | @@ -153,7 +153,7 @@ |
154 | 154 | * @param $file File |
155 | 155 | * @param $transcodeKey String |
156 | 156 | * |
157 | | - * @returns the local target encode path |
| 157 | + * @return the local target encode path |
158 | 158 | */ |
159 | 159 | static public function getTargetEncodePath( &$file, $transcodeKey ){ |
160 | 160 | // TODO probably should use some other temporary non-web accessible location for |
— | — | @@ -271,7 +271,7 @@ |
272 | 272 | * @param {Object} File object |
273 | 273 | * @param {Object} Options, a set of options: |
274 | 274 | * 'nodata' Strips the data- attribute, useful when your output is not html |
275 | | - * @returns an associative array of sources suitable for <source> tag output |
| 275 | + * @return an associative array of sources suitable for <source> tag output |
276 | 276 | */ |
277 | 277 | static public function getLocalSources( &$file , $options=array() ){ |
278 | 278 | global $wgEnabledTranscodeSet, $wgEnableTranscode, $wgLang; |
Index: trunk/extensions/ResumableUpload/ResumableUploadHandler.php |
— | — | @@ -29,7 +29,7 @@ |
30 | 30 | * @param $pageText string |
31 | 31 | * @param $watchlist bodolean |
32 | 32 | * |
33 | | - * @returns string the session key for this chunked upload |
| 33 | + * @return string the session key for this chunked upload |
34 | 34 | */ |
35 | 35 | public function setupChunkSession( $comment, $pageText, $watchlist ) { |
36 | 36 | if ( !isset( $this->sessionKey ) ) { |
— | — | @@ -101,7 +101,7 @@ |
102 | 102 | * @param $request WebRequest |
103 | 103 | * @param $fileSize int Size of this chunk |
104 | 104 | * |
105 | | - * @returns void |
| 105 | + * @return void |
106 | 106 | */ |
107 | 107 | protected function initFromSessionKey( $sessionKey, $sessionData, $fileSize ) { |
108 | 108 | // testing against null because we don't want to cause obscure |
Index: trunk/extensions/NewUserMessage/NewUserMessage.class.php |
— | — | @@ -17,7 +17,7 @@ |
18 | 18 | |
19 | 19 | /** |
20 | 20 | * Produce the editor for new user messages. |
21 | | - * @returns User |
| 21 | + * @return User |
22 | 22 | */ |
23 | 23 | static function fetchEditor() { |
24 | 24 | // Create a user object for the editing user and add it to the |
— | — | @@ -37,7 +37,7 @@ |
38 | 38 | |
39 | 39 | /** |
40 | 40 | * Produce a (possibly random) signature. |
41 | | - * @returns String |
| 41 | + * @return String |
42 | 42 | */ |
43 | 43 | static function fetchSignature() { |
44 | 44 | $signatures = wfMsgForContent( 'newusermessage-signatures' ); |
— | — | @@ -58,7 +58,7 @@ |
59 | 59 | |
60 | 60 | /** |
61 | 61 | * Return the template name if it exists, or '' otherwise. |
62 | | - * @returns string |
| 62 | + * @return string |
63 | 63 | */ |
64 | 64 | static function fetchTemplateIfExists( $template ) { |
65 | 65 | $text = Title::newFromText( $template ); |
— | — | @@ -78,7 +78,7 @@ |
79 | 79 | |
80 | 80 | /** |
81 | 81 | * Produce a subject for the message. |
82 | | - * @returns String |
| 82 | + * @return String |
83 | 83 | */ |
84 | 84 | static function fetchSubject() { |
85 | 85 | return self::fetchTemplateIfExists( wfMsg( 'newusermessage-template-subject' ) ); |
— | — | @@ -86,7 +86,7 @@ |
87 | 87 | |
88 | 88 | /** |
89 | 89 | * Produce the template that contains the text of the message. |
90 | | - * @returns String |
| 90 | + * @return String |
91 | 91 | */ |
92 | 92 | static function fetchText() { |
93 | 93 | $template = wfMsg( 'newusermessage-template-body' ); |
— | — | @@ -102,7 +102,7 @@ |
103 | 103 | |
104 | 104 | /** |
105 | 105 | * Produce the flags to set on Article::doEdit |
106 | | - * @returns Int |
| 106 | + * @return Int |
107 | 107 | */ |
108 | 108 | static function fetchFlags() { |
109 | 109 | global $wgNewUserMinorEdit, $wgNewUserSuppressRC; |
— | — | @@ -121,7 +121,7 @@ |
122 | 122 | * @param $editor User |
123 | 123 | * @param $talk Article |
124 | 124 | * @param $preparse if provided, then preparse the string using a Parser |
125 | | - * @returns String |
| 125 | + * @return String |
126 | 126 | */ |
127 | 127 | static private function substString( $str, $user, $editor, $talk, $preparse = null ) { |
128 | 128 | $realName = $user->getRealName(); |
Index: trunk/extensions/SimpleSurvey/SimpleSurvey.php |
— | — | @@ -92,5 +92,3 @@ |
93 | 93 | } |
94 | 94 | unset( $survey ); |
95 | 95 | |
96 | | - |
97 | | - |
Index: trunk/extensions/SemanticResultFormats/GraphViz/SRF_Process.php |
— | — | @@ -158,7 +158,7 @@ |
159 | 159 | * |
160 | 160 | * @param res SMWQueryResult, result set of the ask query provided by SMW |
161 | 161 | * @param outputmode ? |
162 | | - * @returns String, rendered HTML output of this printer for the ask-query |
| 162 | + * @return String, rendered HTML output of this printer for the ask-query |
163 | 163 | * |
164 | 164 | */ |
165 | 165 | protected function getResultText( SMWQueryResult $res, $outputmode ) { |
Index: trunk/extensions/InterwikiIntegration/InterwikiIntegrationChangesList.php |
— | — | @@ -183,7 +183,7 @@ |
184 | 184 | * Show formatted char difference |
185 | 185 | * @param $old Integer: bytes |
186 | 186 | * @param $new Integer: bytes |
187 | | - * @returns String |
| 187 | + * @return String |
188 | 188 | */ |
189 | 189 | public static function showCharacterDifference( $old, $new ) { |
190 | 190 | global $wgRCChangedSizeThreshold, $wgLang, $wgMiserMode; |
Index: trunk/extensions/MobileFrontend/DeviceDetection.php |
— | — | @@ -14,6 +14,9 @@ |
15 | 15 | // may be extended to provide access to particular devices functionality |
16 | 16 | class DeviceDetection { |
17 | 17 | |
| 18 | + /** |
| 19 | + * @return array |
| 20 | + */ |
18 | 21 | public function availableFormats() { |
19 | 22 | $formats = array ( |
20 | 23 | 'html' => array ( |
Index: trunk/extensions/Wikilog/Wikilog.php |
— | — | @@ -406,7 +406,7 @@ |
407 | 407 | * namespace, and returns an appropriate WikilogInfo instance if so. |
408 | 408 | * |
409 | 409 | * @param $title Article title object. |
410 | | - * @returns WikilogInfo instance, or NULL. |
| 410 | + * @return WikilogInfo instance, or NULL. |
411 | 411 | */ |
412 | 412 | static function getWikilogInfo( $title ) { |
413 | 413 | global $wgWikilogNamespaces; |
Index: trunk/extensions/Wikilog/WikilogCommentsPage.php |
— | — | @@ -496,7 +496,7 @@ |
497 | 497 | /** |
498 | 498 | * Checks if the given comment is valid for posting. |
499 | 499 | * @param $comment Comment to validate. |
500 | | - * @returns False if comment is valid, error message identifier otherwise. |
| 500 | + * @return False if comment is valid, error message identifier otherwise. |
501 | 501 | */ |
502 | 502 | protected static function validateComment( WikilogComment &$comment ) { |
503 | 503 | global $wgWikilogMaxCommentSize; |
Index: trunk/extensions/MetavidWiki/includes/articlepages/MV_DataPage.php |
— | — | @@ -84,7 +84,7 @@ |
85 | 85 | } |
86 | 86 | /* |
87 | 87 | * function article top |
88 | | - * @returns MV dataPage top html |
| 88 | + * @return MV dataPage top html |
89 | 89 | */ |
90 | 90 | function mvArticleTop() { |
91 | 91 | global $mvgIP, $wgUser; |
Index: trunk/extensions/ReaderFeedback/ReaderFeedback.hooks.php |
— | — | @@ -62,7 +62,7 @@ |
63 | 63 | /** |
64 | 64 | * Is this a view page action? |
65 | 65 | * @param $action string |
66 | | - * @returns bool |
| 66 | + * @return bool |
67 | 67 | */ |
68 | 68 | protected static function isViewAction( $action ) { |
69 | 69 | return ( $action == 'view' || $action == 'purge' || $action == 'render' ); |
Index: trunk/extensions/ReaderFeedback/specialpages/RatingHistory_body.php |
— | — | @@ -205,7 +205,7 @@ |
206 | 206 | * Generate an HTML table for this tag |
207 | 207 | * @param string $tag |
208 | 208 | * @param string $filePath |
209 | | - * @returns string, html table |
| 209 | + * @return string, html table |
210 | 210 | */ |
211 | 211 | public function makeHTMLTable( $tag, $filePath ) { |
212 | 212 | $dir = dirname($filePath); |
— | — | @@ -255,7 +255,7 @@ |
256 | 256 | * Generate a graph for this tag |
257 | 257 | * @param string $tag |
258 | 258 | * @param string $filePath |
259 | | - * @returns bool, success |
| 259 | + * @return bool, success |
260 | 260 | */ |
261 | 261 | public function makePngGraph( $tag, $filePath ) { |
262 | 262 | if( !function_exists( 'ImageCreate' ) ) { |
— | — | @@ -355,7 +355,7 @@ |
356 | 356 | * Generate a graph for this tag |
357 | 357 | * @param string $tag |
358 | 358 | * @param string $filePath |
359 | | - * @returns bool, success |
| 359 | + * @return bool, success |
360 | 360 | */ |
361 | 361 | public function makeSvgGraph( $tag, $filePath ) { |
362 | 362 | global $wgSvgGraphDir, $wgContLang, $wgMemc; |
— | — | @@ -548,7 +548,7 @@ |
549 | 549 | * Get the path to where the corresponding graph file should be |
550 | 550 | * @param string $tag |
551 | 551 | * @param string $ext |
552 | | - * @returns string |
| 552 | + * @return string |
553 | 553 | */ |
554 | 554 | public function getFilePath( $tag, $ext='' ) { |
555 | 555 | global $wgUploadDirectory; |
— | — | @@ -560,7 +560,7 @@ |
561 | 561 | * Get the url to where the corresponding graph file should be |
562 | 562 | * @param string $tag |
563 | 563 | * @param string $ext |
564 | | - * @returns string |
| 564 | + * @return string |
565 | 565 | */ |
566 | 566 | public function getUrlPath( $tag, $ext='' ) { |
567 | 567 | global $wgUploadPath; |
— | — | @@ -689,7 +689,7 @@ |
690 | 690 | * Check if a graph file is expired. Set $this->dScale. |
691 | 691 | * @param string $tag |
692 | 692 | * @param string $path, filepath to existing file |
693 | | - * @returns string |
| 693 | + * @return string |
694 | 694 | */ |
695 | 695 | protected function fileExpired( $tag, $path ) { |
696 | 696 | global $wgMemc; |
— | — | @@ -721,7 +721,7 @@ |
722 | 722 | /** |
723 | 723 | * Get highest touch timestamp of the tags. This uses a tiny filesort. |
724 | 724 | * @param $page Title |
725 | | - * @returns string |
| 725 | + * @return string |
726 | 726 | */ |
727 | 727 | public static function getTouched( $page ) { |
728 | 728 | $dbr = wfGetDB( DB_SLAVE ); |
Index: trunk/extensions/ReaderFeedback/ReaderFeedback.class.php |
— | — | @@ -26,7 +26,7 @@ |
27 | 27 | |
28 | 28 | /** |
29 | 29 | * Get the array of tag feedback tags |
30 | | - * @returns array |
| 30 | + * @return array |
31 | 31 | */ |
32 | 32 | public static function getFeedbackTags() { |
33 | 33 | self::load(); |
— | — | @@ -36,7 +36,7 @@ |
37 | 37 | /** |
38 | 38 | * Get the weight of a feedback tag |
39 | 39 | * @param string $tag |
40 | | - * @returns array |
| 40 | + * @return array |
41 | 41 | */ |
42 | 42 | public static function getFeedbackWeight( $tag ) { |
43 | 43 | self::load(); |
— | — | @@ -45,7 +45,7 @@ |
46 | 46 | |
47 | 47 | /** |
48 | 48 | * Get the number of reviews that is considered a good sample |
49 | | - * @returns int |
| 49 | + * @return int |
50 | 50 | */ |
51 | 51 | public static function getFeedbackSize() { |
52 | 52 | global $wgFeedbackSizeThreshhold; |
— | — | @@ -79,7 +79,7 @@ |
80 | 80 | |
81 | 81 | /** |
82 | 82 | * Purge outdated page average data |
83 | | - * @returns bool |
| 83 | + * @return bool |
84 | 84 | */ |
85 | 85 | public static function purgeExpiredAverages() { |
86 | 86 | global $wgFeedbackAge; |
— | — | @@ -108,7 +108,7 @@ |
109 | 109 | /** |
110 | 110 | * Expand feedback ratings into an array |
111 | 111 | * @param string $ratings |
112 | | - * @returns Array |
| 112 | + * @return Array |
113 | 113 | */ |
114 | 114 | public static function expandRatings( $rating ) { |
115 | 115 | $dims = array(); |
— | — | @@ -128,7 +128,7 @@ |
129 | 129 | * @param int $period, number of days back |
130 | 130 | * @param array $add, optional vote to add on (used to visually avoid lag) |
131 | 131 | * @param string $cache, optional param to not use cache |
132 | | - * @returns string HTML table |
| 132 | + * @return string HTML table |
133 | 133 | */ |
134 | 134 | public static function getVoteAggregates( |
135 | 135 | $page, $period, $add = array(), $cache = 'useCache' |
Index: trunk/extensions/ReaderFeedback/ReaderFeedbackXML.php |
— | — | @@ -5,7 +5,7 @@ |
6 | 6 | * Get a selector of rateable namespaces |
7 | 7 | * @param int $selected, namespace selected |
8 | 8 | * @param $all Mixed: Value of an item denoting all namespaces, or null to omit |
9 | | - * @returns string |
| 9 | + * @return string |
10 | 10 | */ |
11 | 11 | public static function getNamespaceMenu( $selected=null, $all=null ) { |
12 | 12 | global $wgContLang, $wgFeedbackNamespaces; |
— | — | @@ -42,7 +42,7 @@ |
43 | 43 | /** |
44 | 44 | * Get tag dropdown select |
45 | 45 | * @param int $selected, selected level |
46 | | - * @returns string |
| 46 | + * @return string |
47 | 47 | */ |
48 | 48 | public static function getTagMenu( $selected = '' ) { |
49 | 49 | $s = "<label for='wpRatingTag'>" . wfMsgHtml('readerfeedback-tagfilter') . "</label> "; |
— | — | @@ -57,7 +57,7 @@ |
58 | 58 | /** |
59 | 59 | * Get rating tier dropdown select |
60 | 60 | * @param int $selected, selected tier |
61 | | - * @returns string |
| 61 | + * @return string |
62 | 62 | */ |
63 | 63 | public static function getRatingTierMenu( $selected = '' ) { |
64 | 64 | $s = "<label for='wpRatingTier'>" . wfMsgHtml('readerfeedback-tierfilter') . "</label> "; |