Merge "jsduck: Add @inheritable to static methods from jQuery plugins"

[lhc/web/wiklou.git] / includes / actions / CreditsAction.php

diff --git a/includes/actions/CreditsAction.php b/includes/actions/CreditsAction.php
index 0a2bf30..2bb1be4 100644 (file)
--- a/includes/actions/CreditsAction.php
+++ b/includes/actions/CreditsAction.php
@@ -39,7 +39,7 @@ class CreditsAction extends FormlessAction {
        /**
         * This is largely cadged from PageHistory::history
         *
-        * @return String HTML
+        * @return string HTML
         */
        public function onView() {
                wfProfileIn( __METHOD__ );
@@ -58,9 +58,9 @@ class CreditsAction extends FormlessAction {
        /**
         * Get a list of contributors
         *
-        * @param int $cnt maximum list of contributors to show
-        * @param bool $showIfMax whether to contributors if there more than $cnt
-        * @return String: html
+        * @param int $cnt Maximum list of contributors to show
+        * @param bool $showIfMax Whether to contributors if there more than $cnt
+        * @return string html
         */
        public function getCredits( $cnt, $showIfMax = true ) {
                wfProfileIn( __METHOD__ );
@@ -74,13 +74,14 @@ class CreditsAction extends FormlessAction {
                }
 
                wfProfileOut( __METHOD__ );
+
                return $s;
        }
 
        /**
         * Get the last author with the last modification time
         * @param Page $page
-        * @return String HTML
+        * @return string HTML
         */
        protected function getAuthor( Page $page ) {
                $user = User::newFromName( $page->getUserText(), false );
@@ -94,15 +95,16 @@ class CreditsAction extends FormlessAction {
                        $d = '';
                        $t = '';
                }
+
                return $this->msg( 'lastmodifiedatby', $d, $t )->rawParams(
                        $this->userLink( $user ) )->params( $user->getName() )->escaped();
        }
 
        /**
         * Get a list of contributors of $article
-        * @param int $cnt maximum list of contributors to show
-        * @param bool $showIfMax whether to contributors if there more than $cnt
-        * @return String: html
+        * @param int $cnt Maximum list of contributors to show
+        * @param bool $showIfMax Whether to contributors if there more than $cnt
+        * @return string html
         */
        protected function getContributors( $cnt, $showIfMax ) {
                global $wgHiddenPrefs;
@@ -125,6 +127,7 @@ class CreditsAction extends FormlessAction {
                $anon_ips = array();
 
                # Sift for real versus user names
+               /** @var $user User */
                foreach ( $contributors as $user ) {
                        $cnt--;
                        if ( $user->isLoggedIn() ) {
@@ -175,6 +178,7 @@ class CreditsAction extends FormlessAction {
                }
 
                $count = count( $fulllist );
+
                # "Based on work by ..."
                return $count
                        ? $this->msg( 'othercontribs' )->rawParams(
@@ -184,8 +188,8 @@ class CreditsAction extends FormlessAction {
 
        /**
         * Get a link to $user's user page
-        * @param $user User object
-        * @return String: html
+        * @param User $user
+        * @return string Html
         */
        protected function link( User $user ) {
                global $wgHiddenPrefs;
@@ -204,8 +208,8 @@ class CreditsAction extends FormlessAction {
 
        /**
         * Get a link to $user's user page
-        * @param $user User object
-        * @return String: html
+        * @param User $user
+        * @return string Html
         */
        protected function userLink( User $user ) {
                $link = $this->link( $user );
@@ -223,7 +227,7 @@ class CreditsAction extends FormlessAction {
 
        /**
         * Get a link to action=credits of $article page
-        * @return String: HTML link
+        * @return string HTML link
         */
        protected function othersLink() {
                return Linker::linkKnown(