| Index: trunk/extensions/NaturalLanguageList/NaturalLanguageList.php |
| — | — | @@ -115,12 +115,12 @@ |
| 116 | 116 | public $mArgs; |
| 117 | 117 | private $mSeparator = null; |
| 118 | 118 | private $mOptions = array( |
| 119 | | - 'fieldsperitem' => -1, # size of pairs |
| 120 | | - 'duplicates' => true, # allow same elements to appear |
| 121 | | - 'blanks' => false, # allow blank elements to appear |
| 122 | | - 'itemoutput' => null, # the format for each element |
| 123 | | - 'outputseparator' => null, # the separator between output elements |
| 124 | | - 'lastseparator' => null, # the separator between the last two elements |
| | 119 | + 'fieldsperitem' => -1, # size of pairs |
| | 120 | + 'duplicates' => true, # allow same elements to appear |
| | 121 | + 'blanks' => false, # allow blank elements to appear |
| | 122 | + 'itemoutput' => null, # the format for each element |
| | 123 | + 'outputseparator' => null, # the separator between output elements |
| | 124 | + 'lastseparator' => null, # the separator between the last two elements |
| 125 | 125 | ); |
| 126 | 126 | private $mReaditems = array(); |
| 127 | 127 | public $mParams = array(); |
| — | — | @@ -169,7 +169,7 @@ |
| 170 | 170 | /** |
| 171 | 171 | * Create $this->mParams from $this->mReaditems using $this->mOptions. |
| 172 | 172 | * |
| 173 | | - * @param $separator [default:null] Input separator (e.g. ',') |
| | 173 | + * @param $separator String [default:null] Input separator (e.g. ',') |
| 174 | 174 | */ |
| 175 | 175 | private function readArgs( $separator=null ) { |
| 176 | 176 | $items = array(); # array of args to include |
| — | — | @@ -202,7 +202,7 @@ |
| 203 | 203 | * Create $this->mOptions and $this->mReaditems from $this->mArgs using $this->mFrame. |
| 204 | 204 | * |
| 205 | 205 | * @param $ignorefirst boolean Ignore first element in case of {{#rawlist:}} |
| 206 | | - * @param $separator [default:null] Input separator |
| | 206 | + * @param $separator String [default:null] Input separator |
| 207 | 207 | */ |
| 208 | 208 | private function readOptions ( $ignorefirst, $separator=null ) { |
| 209 | 209 | $args = $this->mArgs; |
| — | — | @@ -277,9 +277,9 @@ |
| 278 | 278 | * If it is, then it handles the option (and applies it). |
| 279 | 279 | * If it isn't, then it just returns the string it found. |
| 280 | 280 | * |
| 281 | | - * @param $arg Argument |
| 282 | | - * @param $separator Input separator |
| 283 | | - * @return Return string if element, else return false |
| | 281 | + * @param $arg String Argument |
| | 282 | + * @param $separator String [default:null] Input separator |
| | 283 | + * @return String if element, else return false |
| 284 | 284 | */ |
| 285 | 285 | private function handleInputItem( $arg, $separator=null ) { |
| 286 | 286 | if ( $arg instanceof PPNode_DOM ) { |
| — | — | @@ -334,7 +334,7 @@ |
| 335 | 335 | /** |
| 336 | 336 | * Using magic to store all known names for each option |
| 337 | 337 | * |
| 338 | | - * @param $input string |
| | 338 | + * @param $input String |
| 339 | 339 | * @return The option found; otherwise false |
| 340 | 340 | */ |
| 341 | 341 | private static function parseOptionName( $value ) { |
| — | — | @@ -360,9 +360,9 @@ |
| 361 | 361 | /** |
| 362 | 362 | * Insert a new element into an array. |
| 363 | 363 | * |
| 364 | | - * @param $array The array in question |
| 365 | | - * @param $value The element to be inserted |
| 366 | | - * @param $separator [default:null] Input separator |
| | 364 | + * @param $array Array The array in question |
| | 365 | + * @param $value Mixed The element to be inserted |
| | 366 | + * @param $separator String [default:null] Input separator |
| 367 | 367 | */ |
| 368 | 368 | private static function parseArrayItem( &$array, $value, $separator=null ) { |
| 369 | 369 | # if no separator, just assume the value can be appended, |
| — | — | @@ -382,7 +382,7 @@ |
| 383 | 383 | * Parse numeral |
| 384 | 384 | * |
| 385 | 385 | * @param $value Integer |
| 386 | | - * @param $default [default:1] Integer |
| | 386 | + * @param $default Integer [default:1] |
| 387 | 387 | * @return The integer if integer and above 0, otherwise $default |
| 388 | 388 | */ |
| 389 | 389 | private static function parseNumeral( $value, $default = 1 ) { |
| — | — | @@ -396,7 +396,7 @@ |
| 397 | 397 | * Parse string |
| 398 | 398 | * |
| 399 | 399 | * @param $value String |
| 400 | | - * @param $default [default:null] String |
| | 400 | + * @param $default String [default:null] |
| 401 | 401 | * @return The string, if none found, return $default |
| 402 | 402 | */ |
| 403 | 403 | private static function parseString( $value, $default = null ) { |