Merge "Correctly handle incorrect namespace in cleanupTitles.php"

[lhc/web/wiklou.git] / includes / Licenses.php

diff --git a/includes/Licenses.php b/includes/Licenses.php
index ba504a9..0bcbc91 100644 (file)
--- a/includes/Licenses.php
+++ b/includes/Licenses.php
@@ -28,31 +28,25 @@
  * A License class for use on Special:Upload
  */
 class Licenses extends HTMLFormField {
-       /**
-        * @var string
-        */
+       /** @var string */
        protected $msg;
 
-       /**
-        * @var array
-        */
+       /** @var array */
        protected $licenses = array();
 
-       /**
-        * @var string
-        */
+       /** @var string */
        protected $html;
        /**#@-*/
 
        /**
-        * Constructor
-        *
-        * @param $params array
+        * @param array $params
         */
        public function __construct( $params ) {
                parent::__construct( $params );
 
-               $this->msg = empty( $params['licenses'] ) ? wfMessage( 'licenses' )->inContentLanguage()->plain() : $params['licenses'];
+               $this->msg = empty( $params['licenses'] )
+                       ? wfMessage( 'licenses' )->inContentLanguage()->plain()
+                       : $params['licenses'];
                $this->selected = null;
 
                $this->makeLicenses();
@@ -89,7 +83,7 @@ class Licenses extends HTMLFormField {
        }
 
        /**
-        * @param $str
+        * @param string $str
         * @return array
         */
        protected function trimStars( $str ) {
@@ -98,14 +92,14 @@ class Licenses extends HTMLFormField {
        }
 
        /**
-        * @param $list
-        * @param $path
-        * @param $item
+        * @param array $list
+        * @param array $path
+        * @param mixed $item
         */
        protected function stackItem( &$list, $path, $item ) {
                $position =& $list;
                if ( $path ) {
-                       foreach( $path as $key ) {
+                       foreach ( $path as $key ) {
                                $position =& $position[$key];
                        }
                }
@@ -113,11 +107,11 @@ class Licenses extends HTMLFormField {
        }
 
        /**
-        * @param $tagset
-        * @param $depth int
+        * @param array $tagset
+        * @param int $depth
         */
        protected function makeHtml( $tagset, $depth = 0 ) {
-               foreach ( $tagset as $key => $val )
+               foreach ( $tagset as $key => $val ) {
                        if ( is_array( $val ) ) {
                                $this->html .= $this->outputOption(
                                        $key, '',
@@ -135,21 +129,24 @@ class Licenses extends HTMLFormField {
                                        $depth
                                );
                        }
+               }
        }
 
        /**
-        * @param $message
-        * @param $value
-        * @param $attribs null
-        * @param $depth int
+        * @param string $message
+        * @param string $value
+        * @param null|array $attribs
+        * @param int $depth
         * @return string
         */
        protected function outputOption( $message, $value, $attribs = null, $depth = 0 ) {
                $msgObj = $this->msg( $message );
                $text = $msgObj->exists() ? $msgObj->text() : $message;
                $attribs['value'] = $value;
-               if ( $value === $this->selected )
+               if ( $value === $this->selected ) {
                        $attribs['selected'] = 'selected';
+               }
+
                $val = str_repeat( /* &nbsp */ "\xc2\xa0", $depth * 2 ) . $text;
                return str_repeat( "\t", $depth ) . Xml::element( 'option', $attribs, $val ) . "\n";
        }
@@ -168,7 +165,7 @@ class Licenses extends HTMLFormField {
        /**
         * Accessor for $this->html
         *
-        * @param $value bool
+        * @param bool $value
         *
         * @return string
         */
@@ -195,20 +192,14 @@ class Licenses extends HTMLFormField {
  * A License class for use on Special:Upload (represents a single type of license).
  */
 class License {
-       /**
-        * @var string
-        */
-       var $template;
+       /** @var string */
+       public $template;
 
-       /**
-        * @var string
-        */
-       var $text;
+       /** @var string */
+       public $text;
 
        /**
-        * Constructor
-        *
-        * @param $str String: license name??
+        * @param string $str License name??
         */
        function __construct( $str ) {
                list( $text, $template ) = explode( '|', strrev( $str ), 2 );